diff --git a/package.json b/package.json
index 756d9b8..ef40989 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "main": "index.js",
   "scripts": {
     "lint": "standard",
-    "test": "npm run lint && tape test | tap-spec",
+    "test": "npm run lint && test/bin/run-tests",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "author": "Klaus Trainer <klaus_trainer@apache.org>",
diff --git a/test/bin/run-tests b/test/bin/run-tests
new file mode 100755
index 0000000..b61d920
--- /dev/null
+++ b/test/bin/run-tests
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+NPM_BIN_DIR="$(npm bin)"
+
+cp node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json test/node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json.orig
+cp test/node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json
+$NPM_BIN_DIR/tape test | $NPM_BIN_DIR/tap-spec
+status=$?
+cp test/node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json.orig node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json
+return $status
diff --git a/test/index.js b/test/index.js
index df97149..24b60c8 100644
--- a/test/index.js
+++ b/test/index.js
@@ -16,9 +16,9 @@ const dynamodbOptions = {
 
 const startDbServer = (cb) => {
   const server = dynalite({
-    createTableMs: 0,
-    deleteTableMs: 0,
-    updateTableMs: 0
+    createTableMs: 20,
+    deleteTableMs: 20,
+    updateTableMs: 20
   })
 
   server.listen((err) => {
diff --git a/test/node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json b/test/node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json
index af8a5cd..304fd19 100644
--- a/test/node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json
+++ b/test/node_modules/aws-sdk/apis/dynamodb-2012-08-10.waiters2.json
@@ -2,7 +2,7 @@
   "version": 2,
   "waiters": {
     "TableExists": {
-      "delay": 0.002,
+      "delay": 0.01,
       "operation": "DescribeTable",
       "maxAttempts": 25,
       "acceptors": [
@@ -20,7 +20,7 @@
       ]
     },
     "TableNotExists": {
-      "delay": 0.002,
+      "delay": 0.01,
       "operation": "DescribeTable",
       "maxAttempts": 25,
       "acceptors": [