diff --git a/actioncable/test/javascript/src/test.coffee b/actioncable/test/javascript/src/test.coffee
index 3ce88c7789..eb95fb2604 100644
--- a/actioncable/test/javascript/src/test.coffee
+++ b/actioncable/test/javascript/src/test.coffee
@@ -1,3 +1,3 @@
 #= require action_cable
-#= require_tree ./test_helpers
+#= require ./test_helpers
 #= require_tree ./unit
diff --git a/actioncable/test/javascript/src/test_helpers/consumer_test_helper.coffee b/actioncable/test/javascript/src/test_helpers/consumer_test_helper.coffee
new file mode 100644
index 0000000000..6b145dede8
--- /dev/null
+++ b/actioncable/test/javascript/src/test_helpers/consumer_test_helper.coffee
@@ -0,0 +1,37 @@
+#= require mock-socket
+
+{TestHelpers} = ActionCable
+
+TestHelpers.consumerTest = (name, options = {}, callback) ->
+  unless callback?
+    callback = options
+    options = {}
+
+  options.url ?= TestHelpers.testURL
+
+  QUnit.test name, (assert) ->
+    doneAsync = assert.async()
+
+    ActionCable.WebSocket = MockWebSocket
+    server = new MockServer options.url
+    consumer = ActionCable.createConsumer(options.url)
+
+    server.on "connection", ->
+      clients = server.clients()
+      assert.equal clients.length, 1
+      assert.equal clients[0].readyState, WebSocket.OPEN
+
+    done = ->
+      consumer.disconnect()
+      server.close()
+      doneAsync()
+
+    testData = {assert, consumer, server, done}
+
+    if options.connect is false
+      callback(testData)
+    else
+      server.on "connection", ->
+        testData.client = server.clients()[0]
+        callback(testData)
+      consumer.connect()
diff --git a/actioncable/test/javascript/src/test_helpers/index.coffee b/actioncable/test/javascript/src/test_helpers/index.coffee
index e0d1e412cd..d36524d9cc 100644
--- a/actioncable/test/javascript/src/test_helpers/index.coffee
+++ b/actioncable/test/javascript/src/test_helpers/index.coffee
@@ -3,3 +3,6 @@
 
 ActionCable.TestHelpers =
   testURL: "ws://cable.example.com/"
+
+originalWebSocket = ActionCable.WebSocket
+QUnit.testDone -> ActionCable.WebSocket = originalWebSocket
diff --git a/actioncable/test/javascript/src/test_helpers/mock_websocket.coffee b/actioncable/test/javascript/src/test_helpers/mock_websocket.coffee
deleted file mode 100644
index 147a336efb..0000000000
--- a/actioncable/test/javascript/src/test_helpers/mock_websocket.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-#= require mock-socket
-
-ActionCable.TestHelpers.MockWebSocket = MockWebSocket
-
-server = null
-consumer = null
-
-ActionCable.TestHelpers.createConsumer = (url, callback) ->
-  server = new MockServer url
-  consumer = ActionCable.createConsumer(url)
-  callback(consumer, server)
-
-QUnit.testDone ->
-  if consumer?
-    consumer.disconnect()
-
-  if server?
-    server.clients().forEach (client) -> client.close()
-    server.close()
diff --git a/actioncable/test/javascript/src/unit/consumer_test.coffee b/actioncable/test/javascript/src/unit/consumer_test.coffee
index fd76b086ed..cf8a592255 100644
--- a/actioncable/test/javascript/src/unit/consumer_test.coffee
+++ b/actioncable/test/javascript/src/unit/consumer_test.coffee
@@ -1,40 +1,11 @@
 {module, test} = QUnit
-{testURL, MockWebSocket, createConsumer} = ActionCable.TestHelpers
+{consumerTest} = ActionCable.TestHelpers
 
 module "ActionCable.Consumer", ->
-  module 'with MockWebSocket', (hooks) ->
-    originalWebSocket = ActionCable.WebSocket
+  consumerTest "#connect", connect: false, ({consumer, server, done}) ->
+    server.on("connection", done)
+    consumer.connect()
 
-    hooks.beforeEach ->
-      ActionCable.WebSocket = MockWebSocket
-
-    hooks.afterEach ->
-      ActionCable.WebSocket = originalWebSocket
-
-    test "#connect", (assert) ->
-      done = assert.async()
-
-      createConsumer testURL, (consumer, server) ->
-        server.on "connection", ->
-          clients = server.clients()
-          assert.equal clients.length, 1
-          assert.equal clients[0].readyState, WebSocket.OPEN
-          done()
-
-        consumer.connect()
-
-    test "#disconnect", (assert) ->
-      done = assert.async()
-
-      createConsumer testURL, (consumer, server) ->
-        server.on "connection", ->
-          clients = server.clients()
-          assert.equal clients.length, 1
-
-          clients[0].addEventListener "close", (event) ->
-            assert.equal event.type, "close"
-            done()
-
-          consumer.disconnect()
-
-        consumer.connect()
+  consumerTest "#disconnect", ({consumer, client, done}) ->
+    client.addEventListener("close", done)
+    consumer.disconnect()