diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b2e5fa..f6bfe43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -311,9 +311,7 @@ if(NOT NO_TESTS)
 	set_target_properties(datachannel-tests PROPERTIES
 		VERSION ${PROJECT_VERSION}
 		CXX_STANDARD 17)
-	if(NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Prevent a bug in manifest generation for UWP
-		set_target_properties(datachannel-tests PROPERTIES OUTPUT_NAME tests)
-	endif()
+	set_target_properties(datachannel-tests PROPERTIES OUTPUT_NAME tests)
 	target_include_directories(datachannel-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 	target_link_libraries(datachannel-tests datachannel)
 
@@ -327,9 +325,7 @@ if(NOT NO_TESTS)
 	set_target_properties(datachannel-benchmark PROPERTIES
 		VERSION ${PROJECT_VERSION}
 		CXX_STANDARD 17)
-	if(NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Prevent a bug in manifest generation for UWP
-		set_target_properties(datachannel-benchmark PROPERTIES OUTPUT_NAME benchmark)
-	endif()
+	set_target_properties(datachannel-benchmark PROPERTIES OUTPUT_NAME benchmark)
 	target_compile_definitions(datachannel-benchmark PRIVATE BENCHMARK_MAIN=1)
 	target_include_directories(datachannel-benchmark PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 	target_link_libraries(datachannel-benchmark datachannel)
diff --git a/test/uwp-benchmark/package.appxManifest b/test/uwp-benchmark/package.appxManifest
index e379fc4..8cd7981 100644
--- a/test/uwp-benchmark/package.appxManifest
+++ b/test/uwp-benchmark/package.appxManifest
@@ -23,7 +23,7 @@
 	<Applications>
 		<Application
 			Id="App"
-			Executable="datachannel-benchmark.exe"
+			Executable="benchmark.exe"
 			EntryPoint="datachannel-benchmark.App"
 			desktop4:Subsystem="console"
 			desktop4:SupportsMultipleInstances="true"
diff --git a/test/uwp-tests/package.appxManifest b/test/uwp-tests/package.appxManifest
index 6c22bdd..1da7e86 100644
--- a/test/uwp-tests/package.appxManifest
+++ b/test/uwp-tests/package.appxManifest
@@ -23,7 +23,7 @@
 	<Applications>
 		<Application
 			Id="App"
-			Executable="datachannel-tests.exe"
+			Executable="tests.exe"
 			EntryPoint="datachannel-tests.App"
 			desktop4:Subsystem="console"
 			desktop4:SupportsMultipleInstances="true"