diff --git a/Tests/Functional/GUI/CMakeLists.txt b/Tests/Functional/GUI/CMakeLists.txt
index e4f7bbc5b738e9261bb17fbfad0e2e720b263adc..b5abd0ddaf61c1133d66b6855e078bd7447de1cd 100644
--- a/Tests/Functional/GUI/CMakeLists.txt
+++ b/Tests/Functional/GUI/CMakeLists.txt
@@ -1 +1,36 @@
-add_subdirectory(Std)
+#   ************************************************************************************************
+#
+#   BornAgain: simulate and fit scattering at grazing incidence
+#
+#!  @file      Tests/Functional/GUI/Std/CMakeLists.txt
+#!  @brief     Builds GUI standard tests.
+#
+#              .../Std/TestAll.cpp provides main, which essentially runs RUN_ALL_TESTS().
+#              RUN_ALL_TESTS is a gtest macro that runs tests defined by TEST_F macros.
+#              .../Std/Run.cpp uses such TEST_F macros to define our standard test cases.
+#              Check.cpp provides a callback function that executes one GUI tests:
+#              Run a given simulation directly, and through GUI model, and compare results.
+#
+#!  @homepage  http://www.bornagainproject.org
+#!  @license   GNU General Public License v3 or higher (see COPYING)
+#!  @copyright Forschungszentrum Jülich GmbH 2018
+#!  @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+#
+#   ************************************************************************************************
+
+include(GoogleTest) # provides gtest_discover_tests
+
+set(test TestGuiStd)
+
+set(source_files Check.cpp ../Std/Run.cpp ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
+
+add_executable(${test} ${source_files})
+target_compile_options(${test} PUBLIC -DGUI_STD_TEST)
+target_compile_definitions(${test} PUBLIC DISABLE_DISTRIBUTION_TESTS)
+
+target_include_directories(${test} PUBLIC
+    ${BornAgainGUI_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include)
+target_link_libraries(${test} BornAgainGUI gtest)
+
+gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Gui.)
diff --git a/Tests/Functional/GUI/Std/Check.cpp b/Tests/Functional/GUI/Check.cpp
similarity index 100%
rename from Tests/Functional/GUI/Std/Check.cpp
rename to Tests/Functional/GUI/Check.cpp
diff --git a/Tests/Functional/GUI/Std/CMakeLists.txt b/Tests/Functional/GUI/Std/CMakeLists.txt
deleted file mode 100644
index 48cbd7bded97560d1b230a6485bd84b201d3cb36..0000000000000000000000000000000000000000
--- a/Tests/Functional/GUI/Std/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#   ************************************************************************************************
-#
-#   BornAgain: simulate and fit scattering at grazing incidence
-#
-#!  @file      Tests/Functional/GUI/Std/CMakeLists.txt
-#!  @brief     Builds GUI standard tests.
-#
-#              .../Std/TestAll.cpp provides main, which essentially runs RUN_ALL_TESTS().
-#              RUN_ALL_TESTS is a gtest macro that runs tests defined by TEST_F macros.
-#              .../Std/Run.cpp uses such TEST_F macros to define our standard test cases.
-#              Check.cpp provides a callback function that executes one GUI tests:
-#              Run a given simulation directly, and through GUI model, and compare results.
-#
-#!  @homepage  http://www.bornagainproject.org
-#!  @license   GNU General Public License v3 or higher (see COPYING)
-#!  @copyright Forschungszentrum Jülich GmbH 2018
-#!  @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-#
-#   ************************************************************************************************
-
-include(GoogleTest) # provides gtest_discover_tests
-
-set(test TestGuiStd)
-
-set(source_files Check.cpp ../../Std/Run.cpp ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
-
-add_executable(${test} ${source_files})
-target_compile_options(${test} PUBLIC -DGUI_STD_TEST)
-target_compile_definitions(${test} PUBLIC DISABLE_DISTRIBUTION_TESTS)
-
-target_include_directories(${test} PUBLIC
-    ${BornAgainGUI_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include)
-target_link_libraries(${test} BornAgainGUI gtest)
-
-gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Gui.)