diff --git a/src/routes/test/accesscontrol-test.js b/src/routes/test/accesscontrol-test.js
index 0b8f062f5..366c2e12e 100644
--- a/src/routes/test/accesscontrol-test.js
+++ b/src/routes/test/accesscontrol-test.js
@@ -8,74 +8,20 @@ var accesscontrol = require('../accesscontrol.js'),
     expect = require('expect.js'),
     HttpError = require('connect-lastmile').HttpError;
 
-describe('scopes middleware', function () {
-    it('fails due to empty scope in request', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { authorizedScopes: [ ] } };
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
+describe('access control middleware', function () {
+    describe('passwordAuth', function () {
+        // TBD
     });
 
-    it('fails due to wrong scope in request', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { authorizedScopes: [ 'foobar', 'something' ] } };
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
+    describe('tokenAuth', function () {
+        // TBD
     });
 
-    it('fails due to wrong scope in request', function (done) {
-        var mw = accesscontrol.scope('admin,users')[1];
-        var req = { authInfo: { authorizedScopes: [ 'foobar', 'admin' ] } };
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
+    describe('authorize', function () {
+        // TBD
     });
 
-    it('succeeds with one requested scope and one provided scope', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { authorizedScopes: [ 'admin' ] } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
-    });
-
-    it('succeeds with one requested scope and two provided scopes', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { authorizedScopes: [ 'foobar', 'admin' ] } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
-    });
-
-    it('succeeds with two requested scope and two provided scopes', function (done) {
-        var mw = accesscontrol.scope('admin,foobar')[1];
-        var req = { authInfo: { authorizedScopes: [ 'foobar', 'admin' ] } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
-    });
-
-    it('succeeds with two requested scope and provided wildcard scope', function (done) {
-        var mw = accesscontrol.scope('admin,foobar')[1];
-        var req = { authInfo: { authorizedScopes: [ '*' ] } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
+    describe('websocketAuth', function () {
+        // TBD
     });
 });