diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java
index 9b051b6ff94..a07752930bf 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java
@@ -74,7 +74,7 @@ public class BaseTestCase {
     	}
 		
 		// Set these up in case we will be running Remote tests.  They will be ignored if we don't
-    	attrs.put(ATTR_DEBUG_SERVER_NAME, "gdbserver.7.1");
+    	attrs.put(ATTR_DEBUG_SERVER_NAME, "gdbserver");
     	attrs.put(IGDBLaunchConfigurationConstants.ATTR_REMOTE_TCP, true);
     	attrs.put(IGDBLaunchConfigurationConstants.ATTR_HOST, "localhost");
     	attrs.put(IGDBLaunchConfigurationConstants.ATTR_PORT, "9999");