diff --git a/manual tests/6 qt4/main.cpp b/manual tests/6 qt4/main.cpp
deleted file mode 100644
index 30fcd4b28..000000000
--- a/manual tests/6 qt4/main.cpp	
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <QApplication>
-#include "mainWindow.h"
-
-int main(int argc, char **argv) {
-  QApplication app(argc, argv);
-  MainWindow *win = new MainWindow();
-  QImage qi(":/thing.png");
-  if(qi.width() != 640) {
-      return 1;
-  }
-  QImage qi2(":/thing2.png");
-  if(qi2.width() != 640) {
-      return 1;
-  }
-  win->setWindowTitle("Meson Qt4 build test");
-
-  win->show();
-  return app.exec();
-  return 0;
-}
diff --git a/manual tests/6 qt4/meson.build b/manual tests/6 qt4/meson.build
deleted file mode 100644
index 94f78abf1..000000000
--- a/manual tests/6 qt4/meson.build	
+++ /dev/null
@@ -1,41 +0,0 @@
-project('qt4 build test', 'cpp')
-
-# This is a manual test rather than an automatic one
-# because during Debian package builds only Qt4 or Qt5
-# can be active.
-
-qt4 = import('qt4')
-qt4dep = dependency('qt4', modules : 'Gui')
-
-prep = qt4.preprocess(moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. 
-                      ui_files : 'mainWindow.ui',     # XML files that need to be compiled with the uic tol.
-                      qresources : 'stuff.qrc',       # Resource file for rcc compiler.
-)
-
-q5exe = executable('qt4app',
-sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing.
-prep],
-dependencies : qt4dep)
-
-# We need a console test application because some test environments
-# do not have an X server.
-
-qt4core = dependency('qt4', modules : 'Core')
-
-qt4coreapp = executable('q4core', 'q4core.cpp',
-dependencies : qt4core)
-
-test('qt4test', qt4coreapp)
-
-# The build system needs to include the cpp files from
-# headers but the user must manually include moc
-# files from sources.
-manpreprocessed = qt4.preprocess(
-    moc_sources : 'manualinclude.cpp',
-    moc_headers : 'manualinclude.h')
-
-q4maninclude = executable('q4maninclude',
-sources : ['manualinclude.cpp', manpreprocessed],
-dependencies : qt4core)
-
-test('q4maninclude', q4maninclude)
diff --git a/manual tests/6 qt4/q4core.cpp b/manual tests/6 qt4/q4core.cpp
deleted file mode 100644
index 706e4dc87..000000000
--- a/manual tests/6 qt4/q4core.cpp	
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <QCoreApplication>
-
-int main(int argc, char **argv) {
-  QCoreApplication app(argc, argv);
-
-  // Don't actually start the main loop so this
-  // can be run as a unit test.
-  //return app.exec();
-  return 0;
-}
diff --git a/manual tests/6 qt4/stuff.qrc b/manual tests/6 qt4/stuff.qrc
deleted file mode 100644
index 9152500a3..000000000
--- a/manual tests/6 qt4/stuff.qrc	
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-  <qresource>
-      <file>thing.png</file>
-      <file>thing2.png</file>
-  </qresource>
-</RCC>
diff --git a/test cases/frameworks/4 qt5/main.cpp b/test cases/frameworks/4 qt/main.cpp
similarity index 100%
rename from test cases/frameworks/4 qt5/main.cpp
rename to test cases/frameworks/4 qt/main.cpp
diff --git a/manual tests/6 qt4/mainWindow.cpp b/test cases/frameworks/4 qt/mainWindow.cpp
similarity index 100%
rename from manual tests/6 qt4/mainWindow.cpp
rename to test cases/frameworks/4 qt/mainWindow.cpp
diff --git a/manual tests/6 qt4/mainWindow.h b/test cases/frameworks/4 qt/mainWindow.h
similarity index 100%
rename from manual tests/6 qt4/mainWindow.h
rename to test cases/frameworks/4 qt/mainWindow.h
diff --git a/manual tests/6 qt4/mainWindow.ui b/test cases/frameworks/4 qt/mainWindow.ui
similarity index 100%
rename from manual tests/6 qt4/mainWindow.ui
rename to test cases/frameworks/4 qt/mainWindow.ui
diff --git a/manual tests/6 qt4/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp
similarity index 100%
rename from manual tests/6 qt4/manualinclude.cpp
rename to test cases/frameworks/4 qt/manualinclude.cpp
diff --git a/manual tests/6 qt4/manualinclude.h b/test cases/frameworks/4 qt/manualinclude.h
similarity index 100%
rename from manual tests/6 qt4/manualinclude.h
rename to test cases/frameworks/4 qt/manualinclude.h
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt/meson.build
similarity index 100%
rename from test cases/frameworks/4 qt5/meson.build
rename to test cases/frameworks/4 qt/meson.build
diff --git a/test cases/frameworks/4 qt5/q5core.cpp b/test cases/frameworks/4 qt/q5core.cpp
similarity index 100%
rename from test cases/frameworks/4 qt5/q5core.cpp
rename to test cases/frameworks/4 qt/q5core.cpp
diff --git a/test cases/frameworks/4 qt5/stuff.qrc b/test cases/frameworks/4 qt/stuff.qrc
similarity index 100%
rename from test cases/frameworks/4 qt5/stuff.qrc
rename to test cases/frameworks/4 qt/stuff.qrc
diff --git a/test cases/frameworks/4 qt5/stuff2.qrc b/test cases/frameworks/4 qt/stuff2.qrc
similarity index 100%
rename from test cases/frameworks/4 qt5/stuff2.qrc
rename to test cases/frameworks/4 qt/stuff2.qrc
diff --git a/manual tests/6 qt4/thing.png b/test cases/frameworks/4 qt/thing.png
similarity index 100%
rename from manual tests/6 qt4/thing.png
rename to test cases/frameworks/4 qt/thing.png
diff --git a/manual tests/6 qt4/thing2.png b/test cases/frameworks/4 qt/thing2.png
similarity index 100%
rename from manual tests/6 qt4/thing2.png
rename to test cases/frameworks/4 qt/thing2.png
diff --git a/test cases/frameworks/4 qt5/mainWindow.cpp b/test cases/frameworks/4 qt5/mainWindow.cpp
deleted file mode 100644
index cc82c4fb2..000000000
--- a/test cases/frameworks/4 qt5/mainWindow.cpp	
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "mainWindow.h"
-
-MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
-    setupUi(this);
-}
-
-MainWindow::~MainWindow() {
-}
diff --git a/test cases/frameworks/4 qt5/mainWindow.h b/test cases/frameworks/4 qt5/mainWindow.h
deleted file mode 100644
index 7f6d90601..000000000
--- a/test cases/frameworks/4 qt5/mainWindow.h	
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef MES_MAINWINDOW
-#define MES_MAINWINDOW
-
-#include <QObject>
-#include <QMainWindow>
-#include "ui_mainWindow.h"
-
-class NotificationModel;
-
-class MainWindow : public QMainWindow, private Ui_MainWindow {
-    Q_OBJECT
-
-public:
-    explicit MainWindow(QWidget *parent=0);
-    ~MainWindow();
-
-private:
-};
-
-#endif
diff --git a/test cases/frameworks/4 qt5/mainWindow.ui b/test cases/frameworks/4 qt5/mainWindow.ui
deleted file mode 100644
index 2eb226a6e..000000000
--- a/test cases/frameworks/4 qt5/mainWindow.ui	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>270</width>
-    <height>115</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <widget class="QPushButton" name="pushButton">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>10</y>
-      <width>241</width>
-      <height>91</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>I am a button</string>
-    </property>
-   </widget>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/test cases/frameworks/4 qt5/manualinclude.cpp b/test cases/frameworks/4 qt5/manualinclude.cpp
deleted file mode 100644
index 06028823f..000000000
--- a/test cases/frameworks/4 qt5/manualinclude.cpp	
+++ /dev/null
@@ -1,20 +0,0 @@
-#include"manualinclude.h"
-#include<QCoreApplication>
-
-#include<QObject>
-
-ManualInclude::ManualInclude() {
-}
-
-class MocClass : public QObject {
-    Q_OBJECT
-};
-
-int main(int argc, char **argv) {
-    ManualInclude mi;
-    MocClass mc;
-    return 0;
-}
-
-#include"manualinclude.moc"
-
diff --git a/test cases/frameworks/4 qt5/manualinclude.h b/test cases/frameworks/4 qt5/manualinclude.h
deleted file mode 100644
index 4a00b6c28..000000000
--- a/test cases/frameworks/4 qt5/manualinclude.h	
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MANUALINCLUDE_H_
-#define MANUALINCLUDE_H_
-
-#include<QObject>
-
-class ManualInclude : public QObject {
-    Q_OBJECT
-
-public:
-    ManualInclude();
-
-signals:
-    int mysignal();
-};
-
-#endif
diff --git a/test cases/frameworks/4 qt5/thing.png b/test cases/frameworks/4 qt5/thing.png
deleted file mode 100644
index 4b001bd5c..000000000
Binary files a/test cases/frameworks/4 qt5/thing.png and /dev/null differ
diff --git a/test cases/frameworks/4 qt5/thing2.png b/test cases/frameworks/4 qt5/thing2.png
deleted file mode 100644
index 4b001bd5c..000000000
Binary files a/test cases/frameworks/4 qt5/thing2.png and /dev/null differ