diff --git a/package.json b/package.json
index bb81d9f9..aa7bf8c3 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "watch:lint:server": "nodemon -w server -w common -x 'redrun lint:server'",
     "watch:test": "nodemon -w client -w server -w test -w common -x \"npm test\"",
     "watch:test:client": "nodemon -w client -w test/client -x \"npm run test:client\"",
-    "watch:test:server": "nodemon -w client -w test/client -x \"npm run test:server\"",
+    "watch:test:server": "nodemon -w server -w test -x \"npm run test:server\"",
     "watch:coverage": "nodemon -w server -w test -w common -x \"npm run coverage\"",
     "w:c": "redrun watch:client",
     "w:c:d": "redrun watch:client:dev",
diff --git a/test/server/cloudcmd.js b/server/cloudcmd.spec.js
similarity index 86%
rename from test/server/cloudcmd.js
rename to server/cloudcmd.spec.js
index 96c97a96..e3da3de7 100644
--- a/test/server/cloudcmd.js
+++ b/server/cloudcmd.spec.js
@@ -6,23 +6,24 @@ const test = require('tape');
 const diff = require('sinon-called-with-diff');
 const sinon = diff(require('sinon'));
 const currify = require('currify');
-const clean = require('clear-module');
-const request = require('request');
-const {promisify} = require('es6-promisify');
+const {reRequire} = require('mock-require');
 
-const DIR = '../../server/';
+const DIR = './';
 const cloudcmdPath = DIR + 'cloudcmd';
-const beforePath = '../before';
 
 const config = require(DIR + 'config');
 const cloudcmd = require(cloudcmdPath);
-const {connect} = require(beforePath);
 const {
     _getPrefix,
     _auth,
 } = cloudcmd;
 
-const get = promisify(request);
+const {request} = require('serve-once')(cloudcmd, {
+    config: {
+        auth: false,
+        dropbox: false,
+    }
+});
 
 test('cloudcmd: args: no', (t) => {
     const fn = () => cloudcmd();
@@ -93,9 +94,7 @@ test('cloudcmd: replaceDist', (t) => {
     const {NODE_ENV} = process.env;
     process.env.NODE_ENV = 'development';
     
-    clean(cloudcmdPath);
-    
-    const {_replaceDist} = require(cloudcmdPath);
+    const {_replaceDist} = reRequire(cloudcmdPath);
     
     const url = '/dist/hello';
     const result = _replaceDist(url);
@@ -113,8 +112,7 @@ test('cloudcmd: replaceDist: !isDev', (t) => {
     
     const reset = cleanNodeEnv();
     
-    clean(cloudcmdPath);
-    const {_replaceDist} = require(cloudcmdPath);
+    const {_replaceDist} = reRequire(cloudcmdPath);
     
     const result = _replaceDist(url);
     const expected = url;
@@ -201,7 +199,7 @@ function credentials() {
 
 test('cloudcmd: getIndexPath: production', (t) => {
     const isDev = false;
-    const name = path.join(__dirname, '..', '..', 'dist', 'index.html');
+    const name = path.join(__dirname, '..', 'dist', 'index.html');
     
     t.equal(cloudcmd._getIndexPath(isDev), name);
     t.end();
@@ -209,19 +207,16 @@ test('cloudcmd: getIndexPath: production', (t) => {
 
 test('cloudcmd: getIndexPath: development', (t) => {
     const isDev = true;
-    const name = path.join(__dirname, '..', '..', 'dist-dev', 'index.html');
+    const name = path.join(__dirname, '..', 'dist-dev', 'index.html');
     
     t.equal(cloudcmd._getIndexPath(isDev), name);
     t.end();
 });
 
 test('cloudcmd: sw', async (t) => {
-    const {port, done} = await connect();
-    const {statusCode}= await get(`http://localhost:${port}/sw.js`);
+    const {status}= await request.get('/sw.js');
     
-    await done();
-    
-    t.equal(statusCode, 200, 'should return sw');
+    t.equal(status, 200, 'should return sw');
     t.end();
 });