diff --git a/libfreerdp/core/test/TestConnect.c b/libfreerdp/core/test/TestConnect.c
index 573bb734a..86928c839 100644
--- a/libfreerdp/core/test/TestConnect.c
+++ b/libfreerdp/core/test/TestConnect.c
@@ -2,7 +2,9 @@
 #include <winpr/path.h>
 #include <winpr/crypto.h>
 #include <winpr/pipe.h>
+
 #include <freerdp/freerdp.h>
+#include <freerdp/gdi/gdi.h>
 #include <freerdp/client/cmdline.h>
 
 static HANDLE s_sync = NULL;
@@ -24,6 +26,9 @@ static int runInstance(int argc, char* argv[], freerdp** inst, DWORD timeout)
 	if (inst)
 		*inst = context->instance;
 
+	if (!freerdp_settings_set_bool(context->settings, FreeRDP_DeactivateClientDecoding, TRUE))
+		return FALSE;
+
 	if (freerdp_client_settings_parse_command_line(context->settings, argc, argv, FALSE) < 0)
 		goto finish;
 
diff --git a/server/Sample/CMakeLists.txt b/server/Sample/CMakeLists.txt
index 1212eaf31..bc88364cb 100644
--- a/server/Sample/CMakeLists.txt
+++ b/server/Sample/CMakeLists.txt
@@ -48,6 +48,9 @@ if (WIN32)
   set ( SRCS ${SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 endif()
 
+# We need this in runtime path for TestConnect
+file(COPY test_icon.ppm DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
 add_executable(${MODULE_NAME} ${SRCS})
 
 list(APPEND LIBS freerdp-server)