diff --git a/CellFrameDashboard.pro b/CellFrameDashboard.pro
index c8b3e54a3db978a3e72a0ce9cf2eae6bf763344e..3b7a918fd91885072b3717e11915558c15ea6f75 100755
--- a/CellFrameDashboard.pro
+++ b/CellFrameDashboard.pro
@@ -1,6 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService \
-    CellFrameDashboardTests
+SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService
 
 CellFrameDashboardGUI.subdir = CellFrameDashboardGUI
 CellFrameDashboardService.subdir = CellFrameDashboardService
@@ -16,3 +15,8 @@ unix: !mac : !android {
     share_target.path = /opt/cellframe-dashboard/share/
     INSTALLS += share_target
 }
+
+BUILD_DASHBOARD_TESTS {
+    message(BUILD_DASHBOARD_TESTS enabled)
+    SUBDIRS += CellFrameDashboardTests
+}
diff --git a/CellFrameDashboardTests/gtest_dependency.pri b/CellFrameDashboardTests/gtest_dependency.pri
index b51e665dd690cf074205a45c6ce9d270b7580f28..de65828b6029eebb50225c399e86ada77ff484f1 100644
--- a/CellFrameDashboardTests/gtest_dependency.pri
+++ b/CellFrameDashboardTests/gtest_dependency.pri
@@ -1,8 +1,5 @@
 isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)
 
-message("_PRO_FILE_PWD_" = $$_PRO_FILE_PWD_/../../3dparty/googletest)
-
-
 isEmpty(GOOGLETEST_DIR) {
     warning("Using googletest src dir specified at Qt Creator wizard")
     message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")
diff --git a/CellFrameDashboardTests/main.cpp b/CellFrameDashboardTests/main.cpp
index 09bf49acdbbd922d0a7dec60103c08f1b8200a5c..899ed9fab3fdba8cbae9f8ebe37a7ff31282a1bc 100644
--- a/CellFrameDashboardTests/main.cpp
+++ b/CellFrameDashboardTests/main.cpp
@@ -1,5 +1,3 @@
-#include "tst_settings.h"
-
 #include <gtest/gtest.h>
 
 int main(int argc, char *argv[])