diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThread.cc b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThread.cc
index e4d390d5a14..db0bd9ff5d1 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThread.cc
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThread.cc
@@ -21,8 +21,8 @@ unsigned int __stdcall PrintHello(void *threadid)
 void *PrintHello(void *threadid)
 #endif
 {
-   int tid = (int)threadid;
-   printf("Hello World! It's me, thread #%d!\n", tid);
+   long tid = (long)threadid;
+   printf("Hello World! It's me, thread #%ld!\n", tid);
    SLEEP(2); // keep this thread around for a bit; the tests will check for its existence while the main thread is stopped at a breakpoint
 
 #ifdef __MINGW32__
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThreadRunControl.cc b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThreadRunControl.cc
index f30714744ea..4556b07b6dd 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThreadRunControl.cc
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThreadRunControl.cc
@@ -14,9 +14,9 @@ typedef pthread_t TID;
 #endif
 
 // Set a breakpoint here so that both threads stop.
-void firstBreakpoint(int id)
+void firstBreakpoint(long id)
 {
-  printf("First breakpoint method from thread %d\n", id);
+  printf("First breakpoint method from thread %ld\n", id);
 }
   
 
@@ -26,7 +26,7 @@ unsigned int __stdcall PrintHello(void *threadid)
 void *PrintHello(void *threadId)
 #endif
 {
-   int tId = (int)threadId;
+   long tId = (long)threadId;
    firstBreakpoint(tId);  // Stop a first time
 
    SLEEP(1);  // Keep state running a little
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/TracepointTestApp.cc b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/TracepointTestApp.cc
index 5bfe8649f95..ae8acdff923 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/TracepointTestApp.cc
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/TracepointTestApp.cc
@@ -73,8 +73,8 @@ unsigned int __stdcall testTracepoints(void *threadid)
 void *testTracepoints(void *threadid)
 #endif
 {
-    int tid = (int)threadid;
-    printf("Hello World! It's me, thread #%d!\n", tid);
+    long tid = (long)threadid;
+    printf("Hello World! It's me, thread #%ld!\n", tid);
 
     int lIntVar = 12345;
     double lDoubleVar = 12345.12345;