diff --git a/src/Mod/Test/CMakeLists.txt b/src/Mod/Test/CMakeLists.txt
index 93e73270d3..81d1422ed8 100644
--- a/src/Mod/Test/CMakeLists.txt
+++ b/src/Mod/Test/CMakeLists.txt
@@ -11,12 +11,16 @@ SET(Test_SRCS
     UnitTests.py
     Workbench.py
     unittestgui.py
-    InitGui.py
     testmakeWireString.py
     TestPythonSyntax.py
 )
 SOURCE_GROUP("" FILES ${Test_SRCS})
 
+if(BUILD_GUI)
+    add_subdirectory(Gui)
+    list (APPEND Test_SRCS InitGui.py)
+endif(BUILD_GUI)
+
 ADD_CUSTOM_TARGET(Test ALL
     SOURCES ${Test_SRCS}
 )
@@ -29,7 +33,3 @@ INSTALL(
     DESTINATION
         Mod/Test
 )
-
-if(BUILD_GUI)
-    add_subdirectory(Gui)
-endif(BUILD_GUI)
diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt
index db1b9a9d91..5723401f18 100644
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -59,23 +59,21 @@ SET(TestGuiPy_SRCS
     qtunittest.py
 )
 
-add_library(QtUnitGui SHARED ${TestGui_SRCS})
+SET(TestGuiIcon_SVG
+    Resources/icons/TestWorkbench.svg
+)
+
+add_library(QtUnitGui SHARED ${TestGui_SRCS} ${TestGuiPy_SRCS} ${TestGuiIcon_SVG})
 
 target_link_libraries(QtUnitGui ${TestGui_LIBS})
 add_dependencies(QtUnitGui Test)
 
 fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/Mod/Test" qtunittest.py)
+fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Test" ${TestGuiIcon_SVG})
 
 SET_BIN_DIR(QtUnitGui QtUnitGui /Mod/Test)
 SET_PYTHON_PREFIX_SUFFIX(QtUnitGui)
 
 INSTALL(TARGETS QtUnitGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL(FILES ${TestGuiPy_SRCS} DESTINATION Mod/Test)
-
-SET(TestGuiIcon_SVG
-    Resources/icons/TestWorkbench.svg
-)
-
-fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Test" ${TestGuiIcon_SVG})
-
 INSTALL(FILES ${TestGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Test/Resources/icons")