diff --git a/test/api/status.coffee b/test/api/status.coffee
index 99c72bd31c..b70dca0ea5 100644
--- a/test/api/status.coffee
+++ b/test/api/status.coffee
@@ -4,38 +4,10 @@ app = require("../../website/src/server")
 
 describe "Site Status", ->
 
-  describe "Without token or user id", ->
+  describe "GET /status", ->
 
     it "/api/v2/status", (done) ->
       request.get(baseURL + "/status").set("Accept", "application/json").end (res) ->
         expect(res.statusCode).to.equal 200
         expect(res.body.status).to.equal "up"
         done()
-
-    it "/api/v2/user", (done) ->
-      request
-        .get(baseURL + "/user")
-        .set("Accept", "application/json")
-        .set("X-API-User", '')
-        .set("X-API-Key", '')
-        .end (res) ->
-          expect(res.statusCode).to.equal 401
-          expect(res.body.err).to.equal "You must include a token and uid (user id) in your request"
-          done()
-
-  describe "With token or user id", ->
-
-    before (done) ->
-      registerNewUser(done, true)
-
-    it "/api/v2/status", (done) ->
-      request.get(baseURL + "/status").set("Accept", "application/json").end (res) ->
-        expect(res.statusCode).to.equal 200
-        expect(res.body.status).to.equal "up"
-        done()
-
-    it "/api/v2/user", (done) ->
-      request.get(baseURL + "/user").set("Accept", "application/json").end (res) ->
-        expect(res.statusCode).to.equal 200
-        expect(res.body._id).to.equal user._id
-        done()
diff --git a/test/api/users.coffee b/test/api/users.coffee
index e465d1f3d5..87f7897dde 100644
--- a/test/api/users.coffee
+++ b/test/api/users.coffee
@@ -5,6 +5,30 @@ app = require("../../website/src/server")
 
 describe "Users", ->
 
+  describe "GET /user without token or user id", ->
+
+    it "/api/v2/user", (done) ->
+      request
+        .get(baseURL + "/user")
+        .set("Accept", "application/json")
+        .set("X-API-User", '')
+        .set("X-API-Key", '')
+        .end (res) ->
+          expect(res.statusCode).to.equal 401
+          expect(res.body.err).to.equal "You must include a token and uid (user id) in your request"
+          done()
+
+  describe "GET /user with token or user id", ->
+
+    before (done) ->
+      registerNewUser(done, true)
+
+    it "/api/v2/user", (done) ->
+      request.get(baseURL + "/user").set("Accept", "application/json").end (res) ->
+        expect(res.statusCode).to.equal 200
+        expect(res.body._id).to.equal user._id
+        done()
+
   describe "Deleting Users", ->
 
     before (done) ->