diff --git a/src/test/debugger/attach.again.ptvsd.test.ts b/src/test/debugger/attach.again.ptvsd.test.ts
index 83b6c046faec..80ab6b9a0e2d 100644
--- a/src/test/debugger/attach.again.ptvsd.test.ts
+++ b/src/test/debugger/attach.again.ptvsd.test.ts
@@ -49,7 +49,6 @@ suite('Attach Debugger - detach and again again - Experimental', () => {
         await sleep(1000);
         debugClient = createDebugAdapter();
         debugClient.defaultTimeout = DEBUGGER_TIMEOUT;
-        debugClient.defaultTimeout = 1000000;
         await debugClient.start();
     }
     /**
@@ -74,6 +73,8 @@ suite('Attach Debugger - detach and again again - Experimental', () => {
         customEnv['PYTHONPATH'] = ptvsdPath;
         const pythonArgs = ['-m', 'ptvsd', '--server', '--port', `${port}`, '--file', fileToDebug.fileToCommandArgument()];
         procToKill = spawn('python', pythonArgs, { env: customEnv, cwd: path.dirname(fileToDebug) });
+        // wait for socket server to start.
+        await sleep(1000);
         return port;
     }
 
diff --git a/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-ptvsd.re-attach.py b/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-ptvsd.re-attach.py
index 13409d35f4dd..1f4808fb5fb0 100644
--- a/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-ptvsd.re-attach.py
+++ b/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-ptvsd.re-attach.py
@@ -4,6 +4,6 @@
 time.sleep(5)
 for i in range(10000):
     time.sleep(0.5)
-    print(i)
+    pass
 
 print('bye')