diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java
index 2770564e290..b6cc6354e28 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java
@@ -119,12 +119,9 @@ public class GDBProcessesTest extends BaseTestCase {
             }
         });
         /*
-         * Wait for the operation to get over
-         */
-        fWait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER);
-        /*
-         * Assert false if status is not OK
+         * Wait for the operation to complete and validate success.
          */
+        fWait.waitUntilDone(TestsPlugin.massageTimeout(2000));
         Assert.assertTrue(fWait.getMessage(), fWait.isOK());
 
         /*
@@ -161,7 +158,9 @@ public class GDBProcessesTest extends BaseTestCase {
 				fProcService.getExecutionData(threadDmc, rm);
             }
         });
-        fWait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER);
+
+        // Wait for the operation to complete and validate success.
+        fWait.waitUntilDone(TestsPlugin.massageTimeout(2000));
         assertTrue(fWait.getMessage(), fWait.isOK());
         
         IThreadDMData threadData = (IThreadDMData)fWait.getReturnInfo();