diff --git a/tests/system/suite_editors/suite.conf b/tests/system/suite_editors/suite.conf
index 95c4b7e506d..46c8bb025c3 100644
--- a/tests/system/suite_editors/suite.conf
+++ b/tests/system/suite_editors/suite.conf
@@ -7,6 +7,6 @@ HOOK_SUB_PROCESSES=false
 IMPLICITAUTSTART=0
 LANGUAGE=Python
 OBJECTMAP=../objects.map
-TEST_CASES=tst_memberoperator tst_rename_macros
+TEST_CASES=tst_memberoperator tst_rename_macros tst_basic_cpp_support tst_select_all tst_qml_indent tst_qml_editor
 VERSION=2
 WRAPPERS=Qt
diff --git a/tests/system/suite_general/tst_basic_cpp_support/test.py b/tests/system/suite_editors/tst_basic_cpp_support/test.py
similarity index 100%
rename from tests/system/suite_general/tst_basic_cpp_support/test.py
rename to tests/system/suite_editors/tst_basic_cpp_support/test.py
diff --git a/tests/system/suite_qtquick/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py
similarity index 100%
rename from tests/system/suite_qtquick/tst_qml_editor/test.py
rename to tests/system/suite_editors/tst_qml_editor/test.py
diff --git a/tests/system/suite_qtquick/tst_qml_indent/test.py b/tests/system/suite_editors/tst_qml_indent/test.py
similarity index 100%
rename from tests/system/suite_qtquick/tst_qml_indent/test.py
rename to tests/system/suite_editors/tst_qml_indent/test.py
diff --git a/tests/system/suite_general/tst_select_all/test.py b/tests/system/suite_editors/tst_select_all/test.py
similarity index 100%
rename from tests/system/suite_general/tst_select_all/test.py
rename to tests/system/suite_editors/tst_select_all/test.py
diff --git a/tests/system/suite_general/tst_select_all/testdata/files.tsv b/tests/system/suite_editors/tst_select_all/testdata/files.tsv
similarity index 100%
rename from tests/system/suite_general/tst_select_all/testdata/files.tsv
rename to tests/system/suite_editors/tst_select_all/testdata/files.tsv
diff --git a/tests/system/suite_general/suite.conf b/tests/system/suite_general/suite.conf
index 19435bce406..2816a0f2f95 100644
--- a/tests/system/suite_general/suite.conf
+++ b/tests/system/suite_general/suite.conf
@@ -7,6 +7,6 @@ HOOK_SUB_PROCESSES=false
 IMPLICITAUTSTART=0
 LANGUAGE=Python
 OBJECTMAP=../objects.map
-TEST_CASES=tst_openqt_creator tst_build_speedcrunch tst_cmake_speedcrunch tst_basic_cpp_support tst_select_all tst_create_proj_wizard
+TEST_CASES=tst_openqt_creator tst_build_speedcrunch tst_cmake_speedcrunch tst_create_proj_wizard
 VERSION=2
 WRAPPERS=Qt
diff --git a/tests/system/suite_qtquick/suite.conf b/tests/system/suite_qtquick/suite.conf
index fe58474d691..7700a40c5aa 100644
--- a/tests/system/suite_qtquick/suite.conf
+++ b/tests/system/suite_qtquick/suite.conf
@@ -7,6 +7,6 @@ HOOK_SUB_PROCESSES=false
 IMPLICITAUTSTART=0
 LANGUAGE=Python
 OBJECTMAP=../objects.map
-TEST_CASES=tst_qtquick_creation tst_qtquick_creation2 tst_qtquick_creation3 tst_qtquick_creation4 tst_qml_indent tst_qml_editor
+TEST_CASES=tst_qtquick_creation tst_qtquick_creation2 tst_qtquick_creation3 tst_qtquick_creation4
 VERSION=2
 WRAPPERS=Qt