 
       server = app.listen PORT, () ->
         server2 = apiary.listen (PORT + 1), ->
-          # Comment out this timeout to enable race condition bug
-          # Event loop get stuck or idle without this
-          # https://github.com/apiaryio/dredd/issues/282
-          setTimeout () ->
-            undefined
-          , 1000
-
-          execCommand cmd, () ->
-            server2.close ->
-              server.close () ->
-                done()
+          wakeUpEventLoop ->
+            execCommand cmd, () ->
+              server2.close ->
+                server.close () ->
+                  done()
 
     it 'should not print warning about missing APIARY_API_KEY and APIARY_API_NAME', () ->
       assert.notInclude stderr, 'Apiary reporter environment variable APIARY_API_KEY or APIARY_API_NAME not defined.'

      cb null, stdout, stderr, exitStatus
  return

describe "Dredd class Integration", () ->
  dreddCommand = null
  custom = {}

          res.send {}

        server2 = apiary.listen (PORT + 1), ->
          wakeUpEventLoop ->
            execCommand cmd, () ->
              server2.close ->

        server2.on 'close', done

