diff --git a/test/auto/auto.pro b/test/auto/auto.pro
index 682e89d..85235ea 100644
--- a/test/auto/auto.pro
+++ b/test/auto/auto.pro
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    soap \
-    request \
-    utils
+    tst_soap \
+    tst_request \
+    tst_database \
+    tst_utils
diff --git a/test/auto/compress/tst_decompresstest.cpp b/test/auto/compress/tst_decompresstest.cpp
deleted file mode 100644
index c50e395..0000000
--- a/test/auto/compress/tst_decompresstest.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) Filip Bucek - All Rights Reserved
- * Unauthorized copying of this file, via any medium is strictly prohibited
- * Proprietary and confidential
- * Written by Filip Bucek <fbucek@invloop.cz>, 2019
- */
-#include <QtTest>
-
-// add necessary includes here
-
-class decompressTest : public QObject
-{
-    Q_OBJECT
-
-public:
-    decompressTest();
-    ~decompressTest();
-
-private slots:
-    void test_case1();
-
-};
-
-decompressTest::decompressTest()
-{
-
-}
-
-decompressTest::~decompressTest()
-{
-
-}
-
-void decompressTest::test_case1()
-{
-
-}
-
-QTEST_APPLESS_MAIN(decompressTest)
-
-#include "tst_decompresstest.moc"
diff --git a/test/auto/compress/compress.pro b/test/auto/tst_database/tst_database.pro
similarity index 62%
rename from test/auto/compress/compress.pro
rename to test/auto/tst_database/tst_database.pro
index 79064f7..24ef8d8 100644
--- a/test/auto/compress/compress.pro
+++ b/test/auto/tst_database/tst_database.pro
@@ -6,6 +6,4 @@ CONFIG -= app_bundle
 
 TEMPLATE = app
 
-SOURCES +=  tst_decompresstest.cpp
-
-include(../../../serversdkint.pri)
+SOURCES +=  tst_databasetest.cpp
diff --git a/test/auto/tst_database/tst_databasetest.cpp b/test/auto/tst_database/tst_databasetest.cpp
new file mode 100644
index 0000000..a6f0de9
--- /dev/null
+++ b/test/auto/tst_database/tst_databasetest.cpp
@@ -0,0 +1,35 @@
+#include <QtTest>
+
+// add necessary includes here
+
+class DatabaseTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    DatabaseTest();
+    ~DatabaseTest();
+
+private slots:
+    void test_case1();
+
+};
+
+DatabaseTest::DatabaseTest()
+{
+
+}
+
+DatabaseTest::~DatabaseTest()
+{
+
+}
+
+void DatabaseTest::test_case1()
+{
+
+}
+
+QTEST_APPLESS_MAIN(DatabaseTest)
+
+#include "tst_databasetest.moc"
diff --git a/test/auto/request/tst_request.cpp b/test/auto/tst_request/tst_request.cpp
similarity index 100%
rename from test/auto/request/tst_request.cpp
rename to test/auto/tst_request/tst_request.cpp
diff --git a/test/auto/request/request.pro b/test/auto/tst_request/tst_request.pro
similarity index 100%
rename from test/auto/request/request.pro
rename to test/auto/tst_request/tst_request.pro
diff --git a/test/auto/soap/soap.pro b/test/auto/tst_soap/tst_soap.pro
similarity index 100%
rename from test/auto/soap/soap.pro
rename to test/auto/tst_soap/tst_soap.pro
diff --git a/test/auto/soap/tst_soaptest.cpp b/test/auto/tst_soap/tst_soaptest.cpp
similarity index 100%
rename from test/auto/soap/tst_soaptest.cpp
rename to test/auto/tst_soap/tst_soaptest.cpp
diff --git a/test/auto/utils/utils.pro b/test/auto/tst_utils/tst_utils.pro
similarity index 100%
rename from test/auto/utils/utils.pro
rename to test/auto/tst_utils/tst_utils.pro
diff --git a/test/auto/utils/tst_utilstest.cpp b/test/auto/tst_utils/tst_utilstest.cpp
similarity index 100%
rename from test/auto/utils/tst_utilstest.cpp
rename to test/auto/tst_utils/tst_utilstest.cpp