diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
index 1715e5d8c3..3b2026af03 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(Qt5Core CONFIG QUIET)
 if (Qt5Core_FOUND)
 	find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
 else()
-	find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED)
+	find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
 	include(${QT_USE_FILE})
 endif(Qt5Core_FOUND)
 
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
index 711ba8d35f..36693f0e2c 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
@@ -1,16 +1,15 @@
 cmake_minimum_required (VERSION 2.8.12)
 
+project ( cafPdmXml_UnitTests )
+
 find_package(Qt5Core CONFIG QUIET)
 if (Qt5Core_FOUND)
 	find_package(Qt5 CONFIG REQUIRED Core Xml)
 else()
 	find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
-    include(${QT_USE_FILE})
+	include(${QT_USE_FILE})
 endif(Qt5Core_FOUND)
 
-
-project ( cafPdmXml_UnitTests )
-
 include_directories (
 	${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
index 5717515935..99c31d72c3 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required (VERSION 2.8.12)
 
+project ( cafProjectDataModel_UnitTests )
+
 find_package(Qt5Core CONFIG QUIET)
 if (Qt5Core_FOUND)
 	find_package(Qt5 CONFIG REQUIRED Core Xml)
 else()
 	find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
-    include(${QT_USE_FILE})
+	include(${QT_USE_FILE})
 endif(Qt5Core_FOUND)
 
-project ( cafProjectDataModel_UnitTests )
-
 include_directories (
 	${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )