diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 832d658..9d964d6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,15 +2,18 @@ if(PROXYRES_BUILD_CLI)
     set(PROXYCLI_SRCS proxycli.c)
 
     if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-        list(APPEND PROXYCLI_SRCS
+        set(PROXYCLI_ASSETS
             uwp/Square44x44Logo.png
             uwp/Square150x150Logo.png
             uwp/StoreLogo.png
-            uwp/Package.appxmanifest
-            uwp/Windows_TemporaryKey.pfx)
+            uwp/Package.appxmanifest)
+    
+        set_source_files_properties(${PROXYCLI_ASSETS} PROPERTIES 
+            VS_DEPLOYMENT_CONTENT 1
+            VS_DEPLOYMENT_LOCATION "Assets")
     endif()
 
-    add_executable(proxycli ${PROXYCLI_SRCS})
+    add_executable(proxycli ${PROXYCLI_SRCS} ${PROXYCLI_ASSETS})
     target_link_libraries(proxycli PRIVATE proxyres)
 
     if(TARGET CURL::libcurl)
diff --git a/test/uwp/Package.appxmanifest b/test/uwp/Package.appxmanifest
index f2f53cc..6f1f63a 100644
--- a/test/uwp/Package.appxmanifest
+++ b/test/uwp/Package.appxmanifest
@@ -4,13 +4,13 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   IgnorableNamespaces="uap mp">
-  <Identity Name="proxycli" Publisher="CN=CMake" Version="1.0.0.0" />
+  <Identity Name="proxycli" Publisher="CN=CMake Test Cert" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="44aa77dd-e529-4e34-afee-b47dc9485484"
     PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>proxycli</DisplayName>
     <PublisherDisplayName>CMake</PublisherDisplayName>
-    <Logo>StoreLogo.png</Logo>
+    <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
@@ -26,8 +26,8 @@
       desktop4:Subsystem="console"
       desktop4:SupportsMultipleInstances="true">
       <uap:VisualElements DisplayName="proxycli"
-        Square150x150Logo="Square150x150Logo.png"
-        Square44x44Logo="Square44x44Logo.png"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
         Description="proxycli"
         BackgroundColor="transparent">
       </uap:VisualElements>
diff --git a/test/uwp/Windows_TemporaryKey.pfx b/test/uwp/Windows_TemporaryKey.pfx
deleted file mode 100644
index 5a975ee..0000000
Binary files a/test/uwp/Windows_TemporaryKey.pfx and /dev/null differ