diff --git a/appveyor.yml b/appveyor.yml
index ac3521630..5f705f81d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,7 @@ build_script:
 after_build:
   - cd ..
   - cd win32port
-  - IF NOT %LWS_METHOD% == "noserver" makensis -DVERSION=%APPVEYOR_BUILD_VERSION% libwebsockets.nsi
+  - makensis -DVERSION=%APPVEYOR_BUILD_VERSION% libwebsockets.nsi
 
 
 artifacts:
diff --git a/win32port/libwebsockets.nsi b/win32port/libwebsockets.nsi
index 12e85c0c2..cfc66a395 100644
--- a/win32port/libwebsockets.nsi
+++ b/win32port/libwebsockets.nsi
@@ -43,17 +43,17 @@ Section "Files" SecInstall
 	File "..\build\bin\Release\libwebsockets-test-echo.exe"
 	File "..\build\bin\Release\libwebsockets-test-fraggle.exe"
 	File "..\build\bin\Release\libwebsockets-test-ping.exe"
-	File "..\build\bin\Release\libwebsockets-test-server.exe"
-	File "..\build\bin\Release\libwebsockets-test-server-extpoll.exe"
+	File /nonfatal "..\build\bin\Release\libwebsockets-test-server.exe"
+	File /nonfatal "..\build\bin\Release\libwebsockets-test-server-extpoll.exe"
 	File "..\build\bin\Release\websockets.dll"
 
 	SetOutPath "$INSTDIR\libwebsockets-test-server"
-	File "..\build\bin\share\libwebsockets-test-server\favicon.ico"
-	File "..\build\bin\share\libwebsockets-test-server\leaf.jpg"
-	File "..\build\bin\share\libwebsockets-test-server\libwebsockets.org-logo.png"
-	#File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.key.pem"
-	#File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.pem"
-	File "..\build\bin\share\libwebsockets-test-server\test.html"
+	File /nonfatal "..\build\bin\share\libwebsockets-test-server\favicon.ico"
+	File /nonfatal "..\build\bin\share\libwebsockets-test-server\leaf.jpg"
+	File /nonfatal "..\build\bin\share\libwebsockets-test-server\libwebsockets.org-logo.png"
+	File /nonfatal "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.key.pem"
+	File /nonfatal "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.pem"
+	File /nonfatal "..\build\bin\share\libwebsockets-test-server\test.html"
 
 	SetOutPath "$INSTDIR\lib"
 	File "..\build\lib\Release\websockets.lib"
@@ -91,8 +91,8 @@ Section "Uninstall"
 	Delete "$INSTDIR\libwebsockets-test-server\favicon.ico"
 	Delete "$INSTDIR\libwebsockets-test-server\leaf.jpg"
 	Delete "$INSTDIR\libwebsockets-test-server\libwebsockets.org-logo.png"
-	#Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.key.pem"
-	#Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.pem"
+	Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.key.pem"
+	Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.pem"
 	Delete "$INSTDIR\libwebsockets-test-server\test.html"
 	RMDir "$INSTDIR\libwebsockets-test-server"