diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4931c0a7c..5e365b74b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,11 +113,7 @@ add_subdirectory(src/libfwbuilder/etc)
 add_subdirectory(src/libfwbuilder/migration)
 add_subdirectory(src/res)
 add_subdirectory(doc)
-
-if(UNIX AND NOT APPLE)
-  add_subdirectory(src/unit_tests)
-endif()
-
+add_subdirectory(src/unit_tests)
 
 ### Packaging
 add_subdirectory(packaging)
diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
index 8acd22241..f17816c01 100644
--- a/src/unit_tests/CMakeLists.txt
+++ b/src/unit_tests/CMakeLists.txt
@@ -1,53 +1,53 @@
 include( CTest )
 
-find_package(Qt5Test REQUIRED)
+if(BUILD_TESTING AND (UNIX AND NOT APPLE))
+  find_package(Qt5Test REQUIRED)
 
-enable_testing(TRUE)
+  add_subdirectory(main)
 
-add_subdirectory(main)
-
-add_subdirectory(AddressRangeDialogTest)
-add_subdirectory(AddressTableTest)
-add_subdirectory(commandLinePrintingTest)
-add_subdirectory(compilerLibTest)
-add_subdirectory(CustomServiceDialogTest)
-add_subdirectory(DNSTest)
-add_subdirectory(FirewallDialogTest)
-add_subdirectory(FWBTreeTest)
-add_subdirectory(FWObjectTest)
-add_subdirectory(generatedScriptTestsIpfilter)
-add_subdirectory(generatedScriptTestsIpfw)
-add_subdirectory(generatedScriptTestsLinux)
-add_subdirectory(generatedScriptTestsPF)
-add_subdirectory(generatedScriptTestsSecuwall)
-add_subdirectory(genericDialogTest)
-add_subdirectory(GroupObjectDialogTest)
-add_subdirectory(ICMP6ServiceDialogTest)
-add_subdirectory(ICMPServiceDialogTest)
-add_subdirectory(ImporterTest)
-add_subdirectory(Inet6AddrMaskTest)
-add_subdirectory(InetAddrMaskTest)
-add_subdirectory(instDialogClusterTest)
-add_subdirectory(instDialogCompileTest)
-add_subdirectory(instDialogInspectTest)
-add_subdirectory(instDialogInstallTest)
-add_subdirectory(instDialogObjectListTest)
-add_subdirectory(InterfaceDialogTest)
-add_subdirectory(IPDialogTest)
-add_subdirectory(IPServiceDialogTest)
-add_subdirectory(NetworkDialogTest)
-add_subdirectory(newClusterDialogTest)
-add_subdirectory(ObjectManipulatorTest)
-add_subdirectory(ObjectMatcherTest)
-add_subdirectory(parseCommandLineTest)
-add_subdirectory(PFImporterTest)
-add_subdirectory(PIXImporterTest)
-add_subdirectory(RCS)
-add_subdirectory(RuleSetViewContextMenuTest)
-add_subdirectory(RuleSetViewTest)
-add_subdirectory(startTipDialogTest)
-add_subdirectory(TagServiceDialogTest)
-add_subdirectory(TCPServiceDialogTest)
-add_subdirectory(UDPServiceDialogTest)
-add_subdirectory(UsageResolverTest)
-add_subdirectory(UserSerivceDialogTest)
+  add_subdirectory(AddressRangeDialogTest)
+  add_subdirectory(AddressTableTest)
+  add_subdirectory(commandLinePrintingTest)
+  add_subdirectory(compilerLibTest)
+  add_subdirectory(CustomServiceDialogTest)
+  add_subdirectory(DNSTest)
+  add_subdirectory(FirewallDialogTest)
+  add_subdirectory(FWBTreeTest)
+  add_subdirectory(FWObjectTest)
+  add_subdirectory(generatedScriptTestsIpfilter)
+  add_subdirectory(generatedScriptTestsIpfw)
+  add_subdirectory(generatedScriptTestsLinux)
+  add_subdirectory(generatedScriptTestsPF)
+  add_subdirectory(generatedScriptTestsSecuwall)
+  add_subdirectory(genericDialogTest)
+  add_subdirectory(GroupObjectDialogTest)
+  add_subdirectory(ICMP6ServiceDialogTest)
+  add_subdirectory(ICMPServiceDialogTest)
+  add_subdirectory(ImporterTest)
+  add_subdirectory(Inet6AddrMaskTest)
+  add_subdirectory(InetAddrMaskTest)
+  add_subdirectory(instDialogClusterTest)
+  add_subdirectory(instDialogCompileTest)
+  add_subdirectory(instDialogInspectTest)
+  add_subdirectory(instDialogInstallTest)
+  add_subdirectory(instDialogObjectListTest)
+  add_subdirectory(InterfaceDialogTest)
+  add_subdirectory(IPDialogTest)
+  add_subdirectory(IPServiceDialogTest)
+  add_subdirectory(NetworkDialogTest)
+  add_subdirectory(newClusterDialogTest)
+  add_subdirectory(ObjectManipulatorTest)
+  add_subdirectory(ObjectMatcherTest)
+  add_subdirectory(parseCommandLineTest)
+  add_subdirectory(PFImporterTest)
+  add_subdirectory(PIXImporterTest)
+  add_subdirectory(RCS)
+  add_subdirectory(RuleSetViewContextMenuTest)
+  add_subdirectory(RuleSetViewTest)
+  add_subdirectory(startTipDialogTest)
+  add_subdirectory(TagServiceDialogTest)
+  add_subdirectory(TCPServiceDialogTest)
+  add_subdirectory(UDPServiceDialogTest)
+  add_subdirectory(UsageResolverTest)
+  add_subdirectory(UserSerivceDialogTest)
+endif()