diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a5d36b7fa33cbf299f0a949223e3a846f8fce01..bc44741b22bd883f994d5e48a728e4ef6e6eb0bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,6 +170,7 @@ if(BORNAGAIN_GUI)
 endif()
 if(BORNAGAIN_NEWREFL)
     add_subdirectory(gui2)
+    add_subdirectory(Tests/UnitTests/gui2)
 endif()
 
 # TODO: split Core / GUI
diff --git a/gui2/tests/CMakeLists.txt b/Tests/UnitTests/gui2/CMakeLists.txt
similarity index 100%
rename from gui2/tests/CMakeLists.txt
rename to Tests/UnitTests/gui2/CMakeLists.txt
diff --git a/gui2/tests/data/Untitled 1.csv b/Tests/UnitTests/gui2/data/Untitled 1.csv
similarity index 100%
rename from gui2/tests/data/Untitled 1.csv
rename to Tests/UnitTests/gui2/data/Untitled 1.csv
diff --git a/gui2/tests/data/bilayer1.txt b/Tests/UnitTests/gui2/data/bilayer1.txt
similarity index 100%
rename from gui2/tests/data/bilayer1.txt
rename to Tests/UnitTests/gui2/data/bilayer1.txt
diff --git a/gui2/tests/data/bilayer2.txt b/Tests/UnitTests/gui2/data/bilayer2.txt
similarity index 100%
rename from gui2/tests/data/bilayer2.txt
rename to Tests/UnitTests/gui2/data/bilayer2.txt
diff --git a/gui2/tests/data/bilayer3a.txt b/Tests/UnitTests/gui2/data/bilayer3a.txt
similarity index 100%
rename from gui2/tests/data/bilayer3a.txt
rename to Tests/UnitTests/gui2/data/bilayer3a.txt
diff --git a/gui2/tests/data/bilayer3b.txt b/Tests/UnitTests/gui2/data/bilayer3b.txt
similarity index 100%
rename from gui2/tests/data/bilayer3b.txt
rename to Tests/UnitTests/gui2/data/bilayer3b.txt
diff --git a/gui2/tests/data/p15320_00017128_report.csv b/Tests/UnitTests/gui2/data/p15320_00017128_report.csv
similarity index 100%
rename from gui2/tests/data/p15320_00017128_report.csv
rename to Tests/UnitTests/gui2/data/p15320_00017128_report.csv
diff --git a/gui2/tests/libtestmachinery/CMakeLists.txt b/Tests/UnitTests/gui2/libtestmachinery/CMakeLists.txt
similarity index 100%
rename from gui2/tests/libtestmachinery/CMakeLists.txt
rename to Tests/UnitTests/gui2/libtestmachinery/CMakeLists.txt
diff --git a/gui2/tests/libtestmachinery/folderbasedtest.cpp b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
similarity index 100%
rename from gui2/tests/libtestmachinery/folderbasedtest.cpp
rename to Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
diff --git a/gui2/tests/libtestmachinery/folderbasedtest.h b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
similarity index 100%
rename from gui2/tests/libtestmachinery/folderbasedtest.h
rename to Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
diff --git a/gui2/tests/libtestmachinery/google_test.h b/Tests/UnitTests/gui2/libtestmachinery/google_test.h
similarity index 100%
rename from gui2/tests/libtestmachinery/google_test.h
rename to Tests/UnitTests/gui2/libtestmachinery/google_test.h
diff --git a/gui2/tests/libtestmachinery/test_utils.cpp b/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
similarity index 100%
rename from gui2/tests/libtestmachinery/test_utils.cpp
rename to Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
diff --git a/gui2/tests/libtestmachinery/test_utils.h b/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
similarity index 100%
rename from gui2/tests/libtestmachinery/test_utils.h
rename to Tests/UnitTests/gui2/libtestmachinery/test_utils.h
diff --git a/gui2/tests/libtestmachinery/widgetbasedtest.cpp b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
similarity index 100%
rename from gui2/tests/libtestmachinery/widgetbasedtest.cpp
rename to Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
diff --git a/gui2/tests/libtestmachinery/widgetbasedtest.h b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
similarity index 100%
rename from gui2/tests/libtestmachinery/widgetbasedtest.h
rename to Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
diff --git a/gui2/tests/testdareflcore/CMakeLists.txt b/Tests/UnitTests/gui2/testdareflcore/CMakeLists.txt
similarity index 100%
rename from gui2/tests/testdareflcore/CMakeLists.txt
rename to Tests/UnitTests/gui2/testdareflcore/CMakeLists.txt
diff --git a/gui2/tests/testdareflcore/TestAll.cpp b/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/TestAll.cpp
rename to Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
diff --git a/gui2/tests/testdareflcore/applicationmodels.test.cpp b/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/applicationmodels.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp
diff --git a/gui2/tests/testdareflcore/datahandler.test.cpp b/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/datahandler.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
diff --git a/gui2/tests/testdareflcore/dataloader_utils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/dataloader_utils.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
diff --git a/gui2/tests/testdareflcore/dataselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/dataselectionmodel.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
diff --git a/gui2/tests/testdareflcore/defaultparser.test.cpp b/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/defaultparser.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
diff --git a/gui2/tests/testdareflcore/experimentaldatamodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/experimentaldatamodel.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp
diff --git a/gui2/tests/testdareflcore/importdataeditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/importdataeditoractions.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
diff --git a/gui2/tests/testdareflcore/importtableheader.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/importtableheader.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
diff --git a/gui2/tests/testdareflcore/instrumentitems.test.cpp b/Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/instrumentitems.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp
diff --git a/gui2/tests/testdareflcore/layereditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/layereditoractions.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
diff --git a/gui2/tests/testdareflcore/layerelements.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/layerelements.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
diff --git a/gui2/tests/testdareflcore/layeritems.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/layeritems.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
diff --git a/gui2/tests/testdareflcore/layerselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/layerselectionmodel.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
diff --git a/gui2/tests/testdareflcore/layerviewmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/layerviewmodel.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
diff --git a/gui2/tests/testdareflcore/materialprofile.test.cpp b/Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/materialprofile.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp
diff --git a/gui2/tests/testdareflcore/modelutils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/modelutils.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp
diff --git a/gui2/tests/testdareflcore/quicksimutils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/quicksimutils.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
diff --git a/gui2/tests/testdareflcore/sldelementcontroller.test.cpp b/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
similarity index 100%
rename from gui2/tests/testdareflcore/sldelementcontroller.test.cpp
rename to Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
diff --git a/gui2/CMakeLists.txt b/gui2/CMakeLists.txt
index ad9ee3057a46f359896615b842f7f97fdd1ecc2f..45442546cfd45fbcf71441e96f94d2eb22114a3d 100644
--- a/gui2/CMakeLists.txt
+++ b/gui2/CMakeLists.txt
@@ -9,4 +9,3 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 include(configuration)
 
 add_subdirectory(source)
-add_subdirectory(tests)