diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a2331e63cf4a280efa6aff714f4696a19dbc3a81..10fb65efd052c1d9d7d7fdd5f50bdec0f93cb5a5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,28 +1,27 @@
-# Large test, employing the full simulator. 
-# validated using deltas on output data
-add_subdirectory(delta)
-
-# Test for the internode communication (eg. mpi)
-add_subdirectory(global_communication)
-
-# Test to check integration between components of the site_name
-add_subdirectory(integration)
-
-# Check for performance: This could include stand alone tests
-# These do not necessarily be run automatically
-add_subdirectory(performance)
-
-# Numbered tests based on bugs in the tracker
-add_subdirectory(regression)
 
 # google test framework
 add_library(gtest gtest-all.cpp)
-
 # tests look for gtest.h here
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+
 # Unit tests
 add_subdirectory(unit)
 
 # Test validating models, possebly needing other software installed
 add_subdirectory(validation)
+
+# Test for the internode communication (eg. mpi)
+add_subdirectory(global_communication)
+
+
+# Proposed additional test types:
+
+# Large test, employing the full simulator. validated using deltas on output data
+
+# Test to check integration between components 
+
+# Tests for performance: This could include stand alone tests. These do not necessarily be run automatically
+
+# Numbered tests based on bugs in the tracker
+
diff --git a/tests/delta/CMakeLists.txt b/tests/delta/CMakeLists.txt
deleted file mode 100644
index f7d000157e4cfd130399d1f718b67fbc5eb2f86d..0000000000000000000000000000000000000000
--- a/tests/delta/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing to be done yet
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
deleted file mode 100644
index f7d000157e4cfd130399d1f718b67fbc5eb2f86d..0000000000000000000000000000000000000000
--- a/tests/integration/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing to be done yet
diff --git a/tests/performance/CMakeLists.txt b/tests/performance/CMakeLists.txt
deleted file mode 100644
index f7d000157e4cfd130399d1f718b67fbc5eb2f86d..0000000000000000000000000000000000000000
--- a/tests/performance/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing to be done yet
diff --git a/tests/regression/CMakeLists.txt b/tests/regression/CMakeLists.txt
deleted file mode 100644
index f7d000157e4cfd130399d1f718b67fbc5eb2f86d..0000000000000000000000000000000000000000
--- a/tests/regression/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing to be done yet