diff --git a/include/etl/signal.h b/include/etl/signal.h
index 0f1703ef..5278cc04 100644
--- a/include/etl/signal.h
+++ b/include/etl/signal.h
@@ -35,7 +35,7 @@ SOFTWARE.
 
 #include "platform.h"
 
-#if ETL_NOT_USING_CPP11
+#if ETL_NOT_USING_CPP11 && !defined(ETL_IN_UNIT_TEST)
 #error NOT SUPPORTED FOR C++03 OR BELOW
 #endif
 
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 3b9bf643..15ccfdbc 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -1422,12 +1422,6 @@
     <ClInclude Include="..\etl_error_handler\assert_function\etl_profile.h">
       <Filter>Tests\Error Handler\Assert Function</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\singleton_base.h">
-      <Filter>UnitTest++\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\function_traits.h">
-      <Filter>UnitTest++\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\type_list.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
@@ -1506,9 +1500,6 @@
     <ClInclude Include="..\..\include\etl\crc16_opensafety_b.h">
       <Filter>ETL\Maths\CRC</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc64_iso.h">
-      <Filter>UnitTest++\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\const_multimap.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
@@ -1524,6 +1515,18 @@
     <ClInclude Include="..\..\include\etl\not_null.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\singleton_base.h">
+      <Filter>ETL\Patterns</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\signal.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\function_traits.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc64_iso.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\test_string_char.cpp">
@@ -3713,6 +3716,12 @@
     <ClCompile Include="..\syntax_check\delegate_observable.h.t.cpp">
       <Filter>Tests\Syntax Checks\Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_signal.cpp">
+      <Filter>Tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\syntax_check\signal.h.t.cpp">
+      <Filter>Tests\Syntax Checks\Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">