diff --git a/client/common/test/TestClientCmdLine.c b/client/common/test/TestClientCmdLine.c
index 5ba8af83e..1d5231ce2 100644
--- a/client/common/test/TestClientCmdLine.c
+++ b/client/common/test/TestClientCmdLine.c
@@ -121,114 +121,114 @@ static test tests[] =
 {
 	{
 		COMMAND_LINE_STATUS_PRINT_HELP, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "--help", 0},
+		{"testfreerdp", "--help", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_STATUS_PRINT_HELP, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/help", 0},
+		{"testfreerdp", "/help", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_STATUS_PRINT_HELP, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "-help", 0},
+		{"testfreerdp", "-help", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_STATUS_PRINT_VERSION, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "--version", 0},
+		{"testfreerdp", "--version", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_STATUS_PRINT_VERSION, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/version", 0},
+		{"testfreerdp", "/version", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_STATUS_PRINT_VERSION, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "-version", 0},
+		{"testfreerdp", "-version", 0},
 		{{0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "test.freerdp.com", 0},
+		{"testfreerdp", "test.freerdp.com", 0},
 		{{0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "-v", "test.freerdp.com", 0},
+		{"testfreerdp", "-v", "test.freerdp.com", 0},
 		{{0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "--v", "test.freerdp.com", 0},
+		{"testfreerdp", "--v", "test.freerdp.com", 0},
 		{{0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/v:test.freerdp.com", 0},
+		{"testfreerdp", "/v:test.freerdp.com", 0},
 		{{0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "--plugin", "rdpsnd", "--plugin", "rdpdr", "--data", "disk:media:"DRIVE_REDIRECT_PATH, "--", "test.freerdp.com", 0},
+		{"testfreerdp", "--plugin", "rdpsnd", "--plugin", "rdpdr", "--data", "disk:media:"DRIVE_REDIRECT_PATH, "--", "test.freerdp.com", 0},
 		{{0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/sound", "/drive:media,"DRIVE_REDIRECT_PATH, "/v:test.freerdp.com", 0},
+		{"testfreerdp", "/sound", "/drive:media,"DRIVE_REDIRECT_PATH, "/v:test.freerdp.com", 0},
 		{{0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "-u", "test", "-p", "test", "test.freerdp.com", 0},
+		{"testfreerdp", "-u", "test", "-p", "test", "test.freerdp.com", 0},
 		{{4, "****"}, {0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "-u", "test", "-p", "test", "-v", "test.freerdp.com", 0},
+		{"testfreerdp", "-u", "test", "-p", "test", "-v", "test.freerdp.com", 0},
 		{{4, "****"}, {0}}
 	},
 	{
 		0, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/u:test", "/p:test", "/v:test.freerdp.com", 0},
+		{"testfreerdp", "/u:test", "/p:test", "/v:test.freerdp.com", 0},
 		{{2, "/p:****"}, {0}}
 	},
 	{
 		COMMAND_LINE_ERROR_NO_KEYWORD, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "-invalid", 0},
+		{"testfreerdp", "-invalid", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_ERROR_NO_KEYWORD, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "--invalid", 0},
+		{"testfreerdp", "--invalid", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_STATUS_PRINT, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/kbd-list", 0},
+		{"testfreerdp", "/kbd-list", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_STATUS_PRINT, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/monitor-list", 0},
+		{"testfreerdp", "/monitor-list", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_ERROR, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/sound", "/drive:media:"DRIVE_REDIRECT_PATH, "/v:test.freerdp.com", 0},
+		{"testfreerdp", "/sound", "/drive:media:"DRIVE_REDIRECT_PATH, "/v:test.freerdp.com", 0},
 		{{0}}
 	},
 	{
 		COMMAND_LINE_ERROR, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "/sound", "/drive:media,/foo/bar/blabla", "/v:test.freerdp.com", 0},
+		{"testfreerdp", "/sound", "/drive:media,/foo/bar/blabla", "/v:test.freerdp.com", 0},
 		{{0}}
 	},
 
 #if 0
 	{
 		COMMAND_LINE_STATUS_PRINT, check_settings_smartcard_no_redirection,
-		{"xfreerdp", "-z", "--plugin", "cliprdr", "--plugin", "rdpsnd", "--data", "alsa", "latency:100", "--", "--plugin", "rdpdr", "--data", "disk:w7share:/home/w7share", "--", "--plugin", "drdynvc", "--data", "tsmf:decoder:gstreamer", "--", "-u", "test", "host.example.com", 0},
+		{"testfreerdp", "-z", "--plugin", "cliprdr", "--plugin", "rdpsnd", "--data", "alsa", "latency:100", "--", "--plugin", "rdpdr", "--data", "disk:w7share:/home/w7share", "--", "--plugin", "drdynvc", "--data", "tsmf:decoder:gstreamer", "--", "-u", "test", "host.example.com", 0},
 		{{0}}
 	},
 #endif