diff --git a/client/dom/current-file.spec.js b/client/dom/current-file.spec.js
index 79cde62b..81537950 100644
--- a/client/dom/current-file.spec.js
+++ b/client/dom/current-file.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const {create} = require('auto-globals');
 const stub = require('@cloudcmd/stub');
 const id = (a) => a;
diff --git a/client/dom/dom-tree.spec.js b/client/dom/dom-tree.spec.js
index 49930704..2a9c767b 100644
--- a/client/dom/dom-tree.spec.js
+++ b/client/dom/dom-tree.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const {create} = require('auto-globals');
 const tryCatch = require('try-catch');
 
diff --git a/client/dom/events/event-store.spec.js b/client/dom/events/event-store.spec.js
index 0f1761d6..0ff1b5bf 100644
--- a/client/dom/events/event-store.spec.js
+++ b/client/dom/events/event-store.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const eventStore = require('./event-store');
 
 test('event-store: get', (t) => {
diff --git a/client/key/vim/find.spec.js b/client/key/vim/find.spec.js
index 66143498..24c84361 100644
--- a/client/key/vim/find.spec.js
+++ b/client/key/vim/find.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 const dir = './';
 
diff --git a/client/key/vim/index.spec.js b/client/key/vim/index.spec.js
index ce2f8a7c..099607d4 100644
--- a/client/key/vim/index.spec.js
+++ b/client/key/vim/index.spec.js
@@ -2,7 +2,7 @@
 
 const {join} = require('path');
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 const mockRequire = require('mock-require');
 const {reRequire} = mockRequire;
diff --git a/client/modules/polyfill.spec.js b/client/modules/polyfill.spec.js
index 482fc287..bbfb4653 100644
--- a/client/modules/polyfill.spec.js
+++ b/client/modules/polyfill.spec.js
@@ -1,6 +1,6 @@
 'use stric';
 
-const test = require('tape');
+const test = require('supertape');
 const mockRequire = require('mock-require');
 const stub = require('@cloudcmd/stub');
 
diff --git a/client/sw/register.spec.js b/client/sw/register.spec.js
index 515a1342..a4db0a0e 100644
--- a/client/sw/register.spec.js
+++ b/client/sw/register.spec.js
@@ -1,10 +1,9 @@
 'use strict';
 
-const tryTo = require('try-to-tape');
 const autoGlobals = require('auto-globals');
-const tape = require('tape');
+const tape = require('supertape');
 
-const test = autoGlobals(tryTo(tape));
+const test = autoGlobals(tape);
 
 const stub = require('@cloudcmd/stub');
 const tryCatch = require('try-catch');
diff --git a/common/cloudfunc.spec.js b/common/cloudfunc.spec.js
index e25d93d5..f04da04f 100644
--- a/common/cloudfunc.spec.js
+++ b/common/cloudfunc.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const cloudfunc = require('./cloudfunc');
 const {
     _getSize,
diff --git a/common/datetime.spec.js b/common/datetime.spec.js
index 96a72b4d..da81f65e 100644
--- a/common/datetime.spec.js
+++ b/common/datetime.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const datetime = require('./datetime');
 
 test('common: datetime', (t) => {
diff --git a/package.json b/package.json
index 6d52b8c0..e5290d52 100644
--- a/package.json
+++ b/package.json
@@ -225,9 +225,8 @@
     "stylelint": "^9.0.0",
     "stylelint-config-standard": "^18.0.0",
     "supermenu": "^2.1.2",
-    "tape": "^4.4.0",
+    "supertape": "^1.0.3",
     "tar-stream": "^1.5.2",
-    "try-to-tape": "^1.0.0",
     "unionfs": "^3.0.2",
     "url-loader": "^1.0.1",
     "version-io": "^2.0.1",
diff --git a/server/cloudcmd.spec.js b/server/cloudcmd.spec.js
index 9fe11dde..5bee6a70 100644
--- a/server/cloudcmd.spec.js
+++ b/server/cloudcmd.spec.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 const currify = require('currify');
 const {reRequire} = require('mock-require');
diff --git a/server/config.spec.js b/server/config.spec.js
index 53346567..fb0a7abb 100644
--- a/server/config.spec.js
+++ b/server/config.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 
 const root = '../';
diff --git a/server/distribute/export.spec.js b/server/distribute/export.spec.js
index 03b81a34..bd28872b 100644
--- a/server/distribute/export.spec.js
+++ b/server/distribute/export.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const io = require('socket.io-client');
 
 const {connect} = require('../../test/before');
diff --git a/server/distribute/import.spec.js b/server/distribute/import.spec.js
index a7949a44..be8d8c7e 100644
--- a/server/distribute/import.spec.js
+++ b/server/distribute/import.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const {promisify} = require('util');
 const tryToCatch = require('try-to-catch');
 const {connect} = require('../../test/before');
diff --git a/server/distribute/log.spec.js b/server/distribute/log.spec.js
index a5763106..91a01a13 100644
--- a/server/distribute/log.spec.js
+++ b/server/distribute/log.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const log = require('./log');
 const config = require('../config');
 
diff --git a/server/exit.spec.js b/server/exit.spec.js
index 169c445e..85ee3a94 100644
--- a/server/exit.spec.js
+++ b/server/exit.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const exit = require('./exit');
 const stub = require('@cloudcmd/stub');
 
diff --git a/server/markdown.spec.js b/server/markdown.spec.js
index 96a37944..b177c044 100644
--- a/server/markdown.spec.js
+++ b/server/markdown.spec.js
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const test = require('tape');
+const test = require('supertape');
 const {promisify} = require('util');
 
 const tryToCatch = require('try-to-catch');
diff --git a/server/rest/index.spec.js b/server/rest/index.spec.js
index b47344aa..e7059a62 100644
--- a/server/rest/index.spec.js
+++ b/server/rest/index.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const rest = require('.');
 const {
     _formatMsg,
diff --git a/server/rest/info.spec.js b/server/rest/info.spec.js
index 5a70e4bd..a067cc68 100644
--- a/server/rest/info.spec.js
+++ b/server/rest/info.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const info = require('./info');
 const stub = require('@cloudcmd/stub');
 
diff --git a/server/root.spec.js b/server/root.spec.js
index 72dc97ec..28b02b25 100644
--- a/server/root.spec.js
+++ b/server/root.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 const mockRequire = require('mock-require');
 const {reRequire} = mockRequire;
diff --git a/server/route.spec.js b/server/route.spec.js
index 4bd23fea..8e21118b 100644
--- a/server/route.spec.js
+++ b/server/route.spec.js
@@ -4,8 +4,7 @@ const path = require('path');
 const fs = require('fs');
 
 const tryToCatch = require('try-to-catch');
-const tryToTape = require('try-to-tape');
-const test = tryToTape(require('tape'));
+const test = require('supertape');
 const mockRequire = require('mock-require');
 const {reRequire} = mockRequire;
 
diff --git a/server/validate.spec.js b/server/validate.spec.js
index 2cdc0918..dd28c111 100644
--- a/server/validate.spec.js
+++ b/server/validate.spec.js
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 const tryCatch = require('try-catch');
 const mockRequire = require('mock-require');
diff --git a/test/client/listeners/get-index.js b/test/client/listeners/get-index.js
index 16dd6999..0f13acd6 100644
--- a/test/client/listeners/get-index.js
+++ b/test/client/listeners/get-index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 
 const dir = '../../../client/listeners';
 const getIndex = require(`${dir}/get-index`);
diff --git a/test/client/listeners/get-range.js b/test/client/listeners/get-range.js
index 9b431de0..80816eca 100644
--- a/test/client/listeners/get-range.js
+++ b/test/client/listeners/get-range.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 
 const dir = '../../../client/listeners';
 const getRange = require(`${dir}/get-range`);
diff --git a/test/client/modules/operation/remove-extension.js b/test/client/modules/operation/remove-extension.js
index 6491f052..de111ebe 100644
--- a/test/client/modules/operation/remove-extension.js
+++ b/test/client/modules/operation/remove-extension.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const dir = '../../../../client/modules/operation';
 
 const removeExtension = require(`${dir}/remove-extension`);
@@ -16,7 +16,7 @@ test('cloudcmd: client: modules: operation: removeExtension: .tar.gz', (t) => {
 test('cloudcmd: client: modules: operation: removeExtension: .tar.bz2', (t) => {
     const name = 'hello';
     const fullName = `${name}.tar.bz2`;
-
+    
     t.equal(removeExtension(fullName), name, 'should remove .tar.bz2');
     t.end();
 });
@@ -24,7 +24,7 @@ test('cloudcmd: client: modules: operation: removeExtension: .tar.bz2', (t) => {
 test('cloudcmd: client: modules: operation: removeExtension: .bz2', (t) => {
     const name = 'hello';
     const fullName = `${name}.bz2`;
-
+    
     t.equal(removeExtension(fullName), name, 'should remove .bz2');
     t.end();
 });
diff --git a/test/common/btoa.js b/test/common/btoa.js
index a18e8947..9a82d5e4 100644
--- a/test/common/btoa.js
+++ b/test/common/btoa.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 
 const btoa = require('../../common/btoa');
diff --git a/test/common/cloudfunc.js b/test/common/cloudfunc.js
index 79eae79d..ee28e53b 100644
--- a/test/common/cloudfunc.js
+++ b/test/common/cloudfunc.js
@@ -15,7 +15,7 @@ const CloudFuncPath = COMMONDIR + 'cloudfunc';
 
 const CloudFunc = require(CloudFuncPath);
 
-const test = require('tape');
+const test = require('supertape');
 const {reRequire} = require('mock-require');
 
 const htmlLooksLike = require('html-looks-like');
diff --git a/test/common/entity.js b/test/common/entity.js
index 43b54d48..8e38f46a 100644
--- a/test/common/entity.js
+++ b/test/common/entity.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const entity = require('../../common/entity');
 
 test('cloudcmd: entity: encode', (t) => {
diff --git a/test/common/util.js b/test/common/util.js
index 52d6a664..f56bad4c 100644
--- a/test/common/util.js
+++ b/test/common/util.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const {reRequire} = require('mock-require');
 const DIR = '../../';
 const UtilPath = DIR + 'common/util';
diff --git a/test/plugins.js b/test/plugins.js
index 4c1b4eb5..10fae877 100644
--- a/test/plugins.js
+++ b/test/plugins.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs');
-const test = require('tape');
+const test = require('supertape');
 const cloudcmd = require('..');
 
 const config = {
diff --git a/test/rest/config.js b/test/rest/config.js
index 0d161e64..5ee2f0ca 100644
--- a/test/rest/config.js
+++ b/test/rest/config.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const os = require('os');
 
-const test = require('tape');
+const test = require('supertape');
 const readjson = require('readjson');
 const writejson = require('writejson');
 
diff --git a/test/rest/cp.js b/test/rest/cp.js
index a409ee55..1dd83f25 100644
--- a/test/rest/cp.js
+++ b/test/rest/cp.js
@@ -2,7 +2,7 @@
 
 const {mkdirSync} = require('fs');
 const {join} = require('path');
-const test = require('tape');
+const test = require('supertape');
 const rimraf = require('rimraf');
 
 const fixtureDir = join(__dirname, '..', 'fixture') + '/';
diff --git a/test/rest/fs.js b/test/rest/fs.js
index c8010c49..94ab1ed2 100644
--- a/test/rest/fs.js
+++ b/test/rest/fs.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const tryToTape = require('try-to-tape');
-const test = tryToTape(require('tape'));
+const test = require('supertape');
 
 const cloudcmd = require('../..');
 const {request} = require('serve-once')(cloudcmd);
diff --git a/test/rest/mv.js b/test/rest/mv.js
index 8ee9b24c..a5475bfd 100644
--- a/test/rest/mv.js
+++ b/test/rest/mv.js
@@ -2,8 +2,7 @@
 
 const fs = require('fs');
 
-const tryToTape = require('try-to-tape');
-const test = tryToTape(require('tape'));
+const test = require('supertape');
 const {Volume} = require('memfs');
 const {ufs} = require('unionfs');
 
diff --git a/test/rest/pack.js b/test/rest/pack.js
index 915bd441..23e44bfd 100644
--- a/test/rest/pack.js
+++ b/test/rest/pack.js
@@ -5,8 +5,7 @@ const {join} = require('path');
 const {promisify} = require('util');
 
 const {reRequire} = require('mock-require');
-const tryToTape = require('try-to-tape');
-const test = tryToTape(require('tape'));
+const test = require('supertape');
 const tar = require('tar-stream');
 const gunzip = require('gunzip-maybe');
 const pullout = require('pullout');
diff --git a/test/rest/rest.js b/test/rest/rest.js
index 947bbb64..70da208a 100644
--- a/test/rest/rest.js
+++ b/test/rest/rest.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const rest = require('../../server/rest');
 
 const {
diff --git a/test/server/columns.js b/test/server/columns.js
index 9869b239..9ccb0e66 100644
--- a/test/server/columns.js
+++ b/test/server/columns.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const fs = require('fs');
 const {reRequire} = require('mock-require');
 const columnsPath = '../../server/columns';
diff --git a/test/server/console.js b/test/server/console.js
index 858bdd89..689665b4 100644
--- a/test/server/console.js
+++ b/test/server/console.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 
-const test = require('tape');
+const test = require('supertape');
 const io = require('socket.io-client');
 
 const configPath = path.join(__dirname, '../..', 'server', 'config');
diff --git a/test/server/env.js b/test/server/env.js
index 7d0fad6e..2357ef63 100644
--- a/test/server/env.js
+++ b/test/server/env.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const env = require('../../server/env');
 
 test('env: small', (t) => {
diff --git a/test/server/modulas.js b/test/server/modulas.js
index afafc2b9..df29007f 100644
--- a/test/server/modulas.js
+++ b/test/server/modulas.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const {join} = require('path');
-const tryTo = require('try-to-tape');
-const test = tryTo(require('tape'));
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 
 const dir = join(__dirname, '..', '..');
diff --git a/test/server/prefixer.js b/test/server/prefixer.js
index a7c7e824..a0cdfcd7 100644
--- a/test/server/prefixer.js
+++ b/test/server/prefixer.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 
 const dir = '../../server/';
 const prefixer = require(dir + 'prefixer');
diff --git a/test/server/show-config.js b/test/server/show-config.js
index d2d597db..cea3a805 100644
--- a/test/server/show-config.js
+++ b/test/server/show-config.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const showConfig = require('../../server/show-config');
 
 test('cloudcmd: show-config: no arguments', (t) => {
diff --git a/test/server/terminal.js b/test/server/terminal.js
index b47a46c9..de1b607d 100644
--- a/test/server/terminal.js
+++ b/test/server/terminal.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const test = require('tape');
+const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 
 const mockRequire = require('mock-require');
diff --git a/test/static.js b/test/static.js
index ed75ffe6..c02d9220 100644
--- a/test/static.js
+++ b/test/static.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const tryTo = require('try-to-tape');
-const test = tryTo(require('tape'));
+const test = require('supertape');
 const criton = require('criton');
 
 const cloudcmd = require('..');