diff --git a/scripts/functional-tests/all_test.suite b/scripts/functional-tests/all_test.suite
new file mode 100644
index 000000000..c530d8a62
--- /dev/null
+++ b/scripts/functional-tests/all_test.suite
@@ -0,0 +1,12 @@
+# Data Type tests
+data-types/progress_test.sah
+data-types/criteria_test.sah
+data-types/unit_measures_test.sah
+data-types/label_test.sah
+data-types/work_report_model.sah
+data-types/exception_days_test.sah
+data-types/work_hours_test.sah
+
+# User tests
+users/user_test.sah
+users/profile_test.sah
diff --git a/scripts/functional-tests/users/all_user_test.suite b/scripts/functional-tests/users/all_user_test.suite
new file mode 100644
index 000000000..4325bdf38
--- /dev/null
+++ b/scripts/functional-tests/users/all_user_test.suite
@@ -0,0 +1,2 @@
+user_test.sah
+profile_test.sah