diff --git a/CMakeLists.txt b/CMakeLists.txt
index 739eb4b..f26502f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(DbMessaging)
 
+add_custom_target(messaging)
+
 add_subdirectory(messagingclient)
 add_subdirectory(messaginglib)
 add_subdirectory(messagingserver)
-add_subdirectory(messagingtest)
diff --git a/messagingclient/CMakeLists.txt b/messagingclient/CMakeLists.txt
index e4fdbb0..9205500 100644
--- a/messagingclient/CMakeLists.txt
+++ b/messagingclient/CMakeLists.txt
@@ -8,3 +8,5 @@ set(SOURCES
 add_executable(messagingclient ${HEADERS} ${SOURCES})
 
 target_link_libraries(messagingclient Qt5::Core Qt5::Network messaginglib)
+
+add_dependencies(messaging messagingclient)
diff --git a/messagingclient/main.cpp b/messagingclient/main.cpp
index 21b94b9..dea6553 100644
--- a/messagingclient/main.cpp
+++ b/messagingclient/main.cpp
@@ -1,31 +1,8 @@
 #include <QCoreApplication>
-#include <QDate>
-#include <QDateTime>
-#include <QVariantMap>
-#include <QDebug>
-
-#include "messages/mymessage.h"
 
 int main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
 
-    MyMessage original("Daniel", QDate(1996, 11, 12), QDateTime::currentDateTime(), 21, 80);
-    MyMessage copy(original);
-
-    original.setName("Peter");
-
-    QVariantMap delta;
-    original.copyTouchedTo(delta);
-    original.setTouched(false);
-
-    qDebug() << "before applying delta";
-    copy.debug();
-
-    copy.apply(delta);
-
-    qDebug() << "after applying delta";
-    copy.debug();
-
     return app.exec();
 }
diff --git a/messaginglib/CMakeLists.txt b/messaginglib/CMakeLists.txt
index 428c762..dda1a64 100644
--- a/messaginglib/CMakeLists.txt
+++ b/messaginglib/CMakeLists.txt
@@ -1,3 +1,5 @@
+enable_testing()
+
 set(HEADERS
     dbmsgbase.h
     dbmsgfieldbase.h
@@ -20,3 +22,10 @@ target_compile_definitions(messaginglib PRIVATE MESSAGINGLIB_LIBRARY)
 target_link_libraries(messaginglib Qt5::Core Qt5::Network)
 
 target_include_directories(messaginglib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_dependencies(messaging messaginglib)
+
+
+add_executable(messagingtest tst_messagingtest.cpp)
+add_test(messagingtest messagingtest)
+target_link_libraries(messagingtest Qt5::Core Qt5::Test messaginglib)
diff --git a/messaginglib/tst_messagingtest.cpp b/messaginglib/tst_messagingtest.cpp
new file mode 100644
index 0000000..f8201a7
--- /dev/null
+++ b/messaginglib/tst_messagingtest.cpp
@@ -0,0 +1,54 @@
+#include <QtTest>
+#include <QDate>
+#include <QDateTime>
+#include <QVariantMap>
+#include <QDebug>
+
+#include "messages/mymessage.h"
+
+class MessagingTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    MessagingTest();
+    ~MessagingTest();
+
+private slots:
+    void test_case1();
+
+};
+
+MessagingTest::MessagingTest()
+{
+
+}
+
+MessagingTest::~MessagingTest()
+{
+
+}
+
+void MessagingTest::test_case1()
+{
+    MyMessage original("Daniel", QDate(1996, 11, 12), QDateTime::currentDateTime(), 21, 80);
+    MyMessage copy(original);
+
+    original.setName("Peter");
+
+    QVariantMap delta;
+    original.copyTouchedTo(delta);
+    original.setTouched(false);
+
+    qDebug() << "before applying delta";
+    copy.debug();
+
+    copy.apply(delta);
+
+    qDebug() << "after applying delta";
+    copy.debug();
+}
+
+QTEST_APPLESS_MAIN(MessagingTest)
+
+#include "tst_messagingtest.moc"
diff --git a/messagingserver/CMakeLists.txt b/messagingserver/CMakeLists.txt
index 09ce4c9..d308778 100644
--- a/messagingserver/CMakeLists.txt
+++ b/messagingserver/CMakeLists.txt
@@ -12,3 +12,5 @@ set(SOURCES
 add_executable(messagingserver ${HEADERS} ${SOURCES})
 
 target_link_libraries(messagingserver Qt5::Core Qt5::Network messaginglib)
+
+add_dependencies(messaging messagingserver)
diff --git a/messagingtest/CMakeLists.txt b/messagingtest/CMakeLists.txt
deleted file mode 100644
index 0853bb9..0000000
--- a/messagingtest/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-enable_testing()
-
-set(HEADERS
-)
-
-set(SOURCES
-    tst_messagingtest.cpp
-)
-
-add_executable(messagingtest ${HEADERS} ${SOURCES})
-
-add_test(messagingtest messagingtest)
-
-target_link_libraries(messagingtest Qt5::Core Qt5::Test messaginglib)
diff --git a/messagingtest/messagingtest.pro b/messagingtest/messagingtest.pro
deleted file mode 100644
index f73e16a..0000000
--- a/messagingtest/messagingtest.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-QT += core testlib
-QT -= gui widgets
-
-DBLIBS += messaginglib
-
-#this makes install step fail
-# CONFIG += testcase
-
-PROJECT_ROOT = ../..
-
-SOURCES += tst_messagingtest.cpp
-
-HEADERS +=
-
-FORMS +=
-
-RESOURCES +=
-
-TRANSLATIONS +=
-
-include($${PROJECT_ROOT}/app.pri)
diff --git a/messagingtest/tst_messagingtest.cpp b/messagingtest/tst_messagingtest.cpp
deleted file mode 100644
index e8fe5d8..0000000
--- a/messagingtest/tst_messagingtest.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <QtTest>
-
-// add necessary includes here
-
-class MessagingTest : public QObject
-{
-    Q_OBJECT
-
-public:
-    MessagingTest();
-    ~MessagingTest();
-
-private slots:
-    void test_case1();
-
-};
-
-MessagingTest::MessagingTest()
-{
-
-}
-
-MessagingTest::~MessagingTest()
-{
-
-}
-
-void MessagingTest::test_case1()
-{
-
-}
-
-QTEST_APPLESS_MAIN(MessagingTest)
-
-#include "tst_messagingtest.moc"