diff --git a/extras/fuzzing/CMakeLists.txt b/extras/fuzzing/CMakeLists.txt
index 44c83d4d..53f4880f 100644
--- a/extras/fuzzing/CMakeLists.txt
+++ b/extras/fuzzing/CMakeLists.txt
@@ -46,6 +46,11 @@ macro(add_fuzzer name)
 		COMMAND
 			"${FUZZER}" "${CORPUS_DIR}" "${SEED_CORPUS_DIR}" -max_total_time=5 -timeout=1
 	)
+
+	set_tests_properties("${FUZZER}"
+		PROPERTIES
+			LABELS 		"Fuzzing"
+	)
 endmacro()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6)
diff --git a/extras/tests/FailingBuilds/CMakeLists.txt b/extras/tests/FailingBuilds/CMakeLists.txt
index e59112bb..10bda9c4 100644
--- a/extras/tests/FailingBuilds/CMakeLists.txt
+++ b/extras/tests/FailingBuilds/CMakeLists.txt
@@ -18,7 +18,8 @@ macro(build_should_fail target)
 	)
 	set_tests_properties(${target} 
 		PROPERTIES
-			WILL_FAIL TRUE
+			WILL_FAIL	TRUE
+			LABELS 		"WillFail;Catch"
 	)
 endmacro()
 
diff --git a/extras/tests/IntegrationTests/CMakeLists.txt b/extras/tests/IntegrationTests/CMakeLists.txt
index 32d28ab5..fd6bbde7 100644
--- a/extras/tests/IntegrationTests/CMakeLists.txt
+++ b/extras/tests/IntegrationTests/CMakeLists.txt
@@ -17,3 +17,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 endif()
 
 add_test(IntegrationTests IntegrationTests)
+
+set_tests_properties(IntegrationTests
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/JsonArray/CMakeLists.txt b/extras/tests/JsonArray/CMakeLists.txt
index ef6bca29..92063a50 100644
--- a/extras/tests/JsonArray/CMakeLists.txt
+++ b/extras/tests/JsonArray/CMakeLists.txt
@@ -20,3 +20,8 @@ add_executable(JsonArrayTests
 )
 
 add_test(JsonArray JsonArrayTests)
+
+set_tests_properties(JsonArray
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/JsonDeserializer/CMakeLists.txt b/extras/tests/JsonDeserializer/CMakeLists.txt
index 8991b99f..2859e2a8 100644
--- a/extras/tests/JsonDeserializer/CMakeLists.txt
+++ b/extras/tests/JsonDeserializer/CMakeLists.txt
@@ -21,3 +21,8 @@ add_executable(JsonDeserializerTests
 set_target_properties(JsonDeserializerTests PROPERTIES UNITY_BUILD OFF)
 
 add_test(JsonDeserializer JsonDeserializerTests)
+
+set_tests_properties(JsonDeserializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/JsonDocument/CMakeLists.txt b/extras/tests/JsonDocument/CMakeLists.txt
index 4e0295e3..4e0237a7 100644
--- a/extras/tests/JsonDocument/CMakeLists.txt
+++ b/extras/tests/JsonDocument/CMakeLists.txt
@@ -22,3 +22,8 @@ add_executable(JsonDocumentTests
 )
 
 add_test(JsonDocument JsonDocumentTests)
+
+set_tests_properties(JsonDocument
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/JsonObject/CMakeLists.txt b/extras/tests/JsonObject/CMakeLists.txt
index 56e76c54..8a65530c 100644
--- a/extras/tests/JsonObject/CMakeLists.txt
+++ b/extras/tests/JsonObject/CMakeLists.txt
@@ -20,3 +20,8 @@ add_executable(JsonObjectTests
 )
 
 add_test(JsonObject JsonObjectTests)
+
+set_tests_properties(JsonObject
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/JsonSerializer/CMakeLists.txt b/extras/tests/JsonSerializer/CMakeLists.txt
index 132e42aa..5450dcaa 100644
--- a/extras/tests/JsonSerializer/CMakeLists.txt
+++ b/extras/tests/JsonSerializer/CMakeLists.txt
@@ -15,3 +15,8 @@ add_executable(JsonSerializerTests
 )
 
 add_test(JsonSerializer JsonSerializerTests)
+
+set_tests_properties(JsonSerializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/JsonVariant/CMakeLists.txt b/extras/tests/JsonVariant/CMakeLists.txt
index 9c8f2738..bd4792d6 100644
--- a/extras/tests/JsonVariant/CMakeLists.txt
+++ b/extras/tests/JsonVariant/CMakeLists.txt
@@ -26,3 +26,8 @@ add_executable(JsonVariantTests
 )
 
 add_test(JsonVariant JsonVariantTests)
+
+set_tests_properties(JsonVariant
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/MemoryPool/CMakeLists.txt b/extras/tests/MemoryPool/CMakeLists.txt
index 6ded1cc5..9682275f 100644
--- a/extras/tests/MemoryPool/CMakeLists.txt
+++ b/extras/tests/MemoryPool/CMakeLists.txt
@@ -11,3 +11,8 @@ add_executable(MemoryPoolTests
 )
 
 add_test(MemoryPool MemoryPoolTests)
+
+set_tests_properties(MemoryPool
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/Misc/CMakeLists.txt b/extras/tests/Misc/CMakeLists.txt
index 553056e3..d15e55c7 100644
--- a/extras/tests/Misc/CMakeLists.txt
+++ b/extras/tests/Misc/CMakeLists.txt
@@ -21,3 +21,8 @@ add_executable(MiscTests
 set_target_properties(MiscTests PROPERTIES UNITY_BUILD OFF)
 
 add_test(Misc MiscTests)
+
+set_tests_properties(Misc
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/extras/tests/MixedConfiguration/CMakeLists.txt b/extras/tests/MixedConfiguration/CMakeLists.txt
index b9f03bd5..9d63caf2 100644
--- a/extras/tests/MixedConfiguration/CMakeLists.txt
+++ b/extras/tests/MixedConfiguration/CMakeLists.txt
@@ -29,3 +29,8 @@ add_executable(MixedConfigurationTests
 set_target_properties(MixedConfigurationTests PROPERTIES UNITY_BUILD OFF)
 
 add_test(MixedConfiguration MixedConfigurationTests)
+
+set_tests_properties(MixedConfiguration
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/MsgPackDeserializer/CMakeLists.txt b/extras/tests/MsgPackDeserializer/CMakeLists.txt
index dc4361f6..bef1229a 100644
--- a/extras/tests/MsgPackDeserializer/CMakeLists.txt
+++ b/extras/tests/MsgPackDeserializer/CMakeLists.txt
@@ -17,3 +17,8 @@ add_executable(MsgPackDeserializerTests
 )
 
 add_test(MsgPackDeserializer MsgPackDeserializerTests)
+
+set_tests_properties(MsgPackDeserializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/MsgPackSerializer/CMakeLists.txt b/extras/tests/MsgPackSerializer/CMakeLists.txt
index 26f98d21..8c51ad47 100644
--- a/extras/tests/MsgPackSerializer/CMakeLists.txt
+++ b/extras/tests/MsgPackSerializer/CMakeLists.txt
@@ -12,3 +12,8 @@ add_executable(MsgPackSerializerTests
 )
 
 add_test(MsgPackSerializer MsgPackSerializerTests)
+
+set_tests_properties(MsgPackSerializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/Numbers/CMakeLists.txt b/extras/tests/Numbers/CMakeLists.txt
index 5a1e147d..d6dcf7f8 100644
--- a/extras/tests/Numbers/CMakeLists.txt
+++ b/extras/tests/Numbers/CMakeLists.txt
@@ -11,3 +11,8 @@ add_executable(NumbersTests
 
 
 add_test(Numbers NumbersTests)
+
+set_tests_properties(Numbers
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file
diff --git a/extras/tests/TextFormatter/CMakeLists.txt b/extras/tests/TextFormatter/CMakeLists.txt
index 9fcd6eba..41976bc1 100644
--- a/extras/tests/TextFormatter/CMakeLists.txt
+++ b/extras/tests/TextFormatter/CMakeLists.txt
@@ -11,3 +11,8 @@ add_executable(TextFormatterTests
 set_target_properties(TextFormatterTests PROPERTIES UNITY_BUILD OFF)
 
 add_test(TextFormatter TextFormatterTests)
+
+set_tests_properties(TextFormatter
+	PROPERTIES
+		LABELS 		"Catch"
+)
\ No newline at end of file