diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 65b1dba3..dde13677 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -138,6 +138,7 @@ add_executable(etl_tests
 	test_crc8_j1850.cpp
 	test_crc8_j1850_zero.cpp
 	test_crc8_maxim.cpp
+	test_crc8_nrsc5.cpp
 	test_crc8_rohc.cpp
 	test_crc8_wcdma.cpp
 	test_crc8_nrsc5.cpp
@@ -364,9 +365,11 @@ elseif (ETL_CXX_STANDARD MATCHES "17")
 elseif (ETL_CXX_STANDARD MATCHES "20")
 	message(STATUS "Compiling for C++20")
 	set_property(TARGET etl_tests PROPERTY CXX_STANDARD 20)
-else()
+elseif (ETL_CXX_STANDARD MATCHES "23")
 	message(STATUS "Compiling for C++23")
 	set_property(TARGET etl_tests PROPERTY CXX_STANDARD 23)
+else()
+	message(STATUS "Unsupported C++ standard")
 endif()
 
 if (NO_STL OR ETL_NO_STL)
@@ -392,7 +395,7 @@ if (ETL_MESSAGES_ARE_NOT_VIRTUAL)
 endif()
 
 if (ETL_FORCE_TEST_CPP03_IMPLEMENTATION)
-	message(STATUS "Compiling for C++03 tests")
+	message(STATUS "Compiling for forced C++03 tests")
 	target_compile_definitions(etl_tests PRIVATE -DETL_FORCE_TEST_CPP03_IMPLEMENTATION)
 endif()
 
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 2ee1f507..dc29a831 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -3344,6 +3344,7 @@
     <ClInclude Include="..\..\include\etl\crc8_j1850.h" />
     <ClInclude Include="..\..\include\etl\crc8_j1850_zero.h" />
     <ClInclude Include="..\..\include\etl\crc8_maxim.h" />
+    <ClInclude Include="..\..\include\etl\crc8_nrsc5.h" />
     <ClInclude Include="..\..\include\etl\crc8_rohc.h" />
     <ClInclude Include="..\..\include\etl\crc8_wcdma.h" />
     <ClInclude Include="..\..\include\etl\expected.h" />
@@ -9339,6 +9340,7 @@
     <ClCompile Include="..\test_crc8_j1850.cpp" />
     <ClCompile Include="..\test_crc8_j1850_zero.cpp" />
     <ClCompile Include="..\test_crc8_maxim.cpp" />
+    <ClCompile Include="..\test_crc8_nrsc5.cpp" />
     <ClCompile Include="..\test_crc8_rohc.cpp" />
     <ClCompile Include="..\test_crc8_wcdma.cpp" />
     <ClCompile Include="..\test_expected.cpp" />
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 5f9dce4c..f0752ccb 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -1524,6 +1524,9 @@
     <ClInclude Include="..\..\include\etl\const_multiset.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_nrsc5.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\test_string_char.cpp">
@@ -3653,6 +3656,9 @@
     <ClCompile Include="..\test_const_multiset_ext_constexpr.cpp">
       <Filter>Tests\Containers</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_crc8_nrsc5.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">