diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f285ea31..642f8f71 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -54,20 +54,6 @@ set(TEST_SOURCES
         )
 CheckFileList(TEST_SOURCES ${SELF_TEST_DIR})
 
-# A set of impl files that just #include a single header
-# Please keep these ordered alphabetically
-set(SURROGATE_SOURCES
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_console_colour.cpp
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_debugger.cpp
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_reporter.cpp
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_option.cpp
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_stream.cpp
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_test_case_tracker.cpp
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_test_spec.cpp
-        ${SELF_TEST_DIR}/SurrogateCpps/catch_xmlwriter.cpp
-        )
-CheckFileList(SURROGATE_SOURCES ${SELF_TEST_DIR}/SurrogateCpps)
-
 
 # Specify the headers, too, so CLion recognises them as project files
 set(HEADERS
@@ -82,7 +68,6 @@ set(HEADERS
 # Provide some groupings for IDEs
 #SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
 #SOURCE_GROUP("Tests" FILES ${TEST_SOURCES})
-#SOURCE_GROUP("Surrogates" FILES ${SURROGATE_SOURCES})
 
 include(CTest)
 
diff --git a/tests/SelfTest/SurrogateCpps/catch_console_colour.cpp b/tests/SelfTest/SurrogateCpps/catch_console_colour.cpp
deleted file mode 100644
index 44e5dc58..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_console_colour.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include <catch2/catch_suppress_warnings.h>
-#include <catch2/catch_console_colour.h>
diff --git a/tests/SelfTest/SurrogateCpps/catch_debugger.cpp b/tests/SelfTest/SurrogateCpps/catch_debugger.cpp
deleted file mode 100644
index 68a65e47..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_debugger.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include <catch2/catch_debugger.h>
diff --git a/tests/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp b/tests/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp
deleted file mode 100644
index cfcfd889..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <catch2/catch_suppress_warnings.h>
-#include <catch2/catch_interfaces_reporter.h>
diff --git a/tests/SelfTest/SurrogateCpps/catch_option.cpp b/tests/SelfTest/SurrogateCpps/catch_option.cpp
deleted file mode 100644
index 4dfbd525..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_option.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include <catch2/catch_suppress_warnings.h>
-#include <catch2/catch_option.hpp>
diff --git a/tests/SelfTest/SurrogateCpps/catch_stream.cpp b/tests/SelfTest/SurrogateCpps/catch_stream.cpp
deleted file mode 100644
index 63df987e..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_stream.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include <catch2/catch_suppress_warnings.h>
-#include <catch2/catch_stream.h>
diff --git a/tests/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp b/tests/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp
deleted file mode 100644
index c8418c8e..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include <catch2/catch_test_case_tracker.h>
diff --git a/tests/SelfTest/SurrogateCpps/catch_test_spec.cpp b/tests/SelfTest/SurrogateCpps/catch_test_spec.cpp
deleted file mode 100644
index 0188cf34..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_test_spec.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include <catch2/catch_suppress_warnings.h>
-#include <catch2/catch_test_spec.h>
diff --git a/tests/SelfTest/SurrogateCpps/catch_xmlwriter.cpp b/tests/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
deleted file mode 100644
index cb442a42..00000000
--- a/tests/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include <catch2/catch_suppress_warnings.h>
-#include <catch2/catch_xmlwriter.h>
-#include <catch2/catch_reenable_warnings.h>