diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..5e5aaf88
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wombat"]
+ path = wombat
+ url = https://github.com/webrecorder/wombat
diff --git a/karma-tests/Makefile b/karma-tests/Makefile
deleted file mode 100644
index bb80eeec..00000000
--- a/karma-tests/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-NODE_BIN_DIR=../node_modules/.bin
-
-test:
- $(NODE_BIN_DIR)/karma start --single-run
diff --git a/karma-tests/dummy.html b/karma-tests/dummy.html
deleted file mode 100644
index 52e695fa..00000000
--- a/karma-tests/dummy.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
diff --git a/karma-tests/karma.conf.js b/karma-tests/karma.conf.js
deleted file mode 100644
index 294c1b48..00000000
--- a/karma-tests/karma.conf.js
+++ /dev/null
@@ -1,108 +0,0 @@
-var sauceLabsConfig = {
- testName: 'pywb Client Tests',
-};
-
-// see https://github.com/karma-runner/karma-sauce-launcher/issues/73
-if (process.env.TRAVIS_JOB_NUMBER) {
- sauceLabsConfig.startConnect = false;
- sauceLabsConfig.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
-}
-
-var WOMBAT_JS_PATH = 'pywb/static/wombat.js';
-
-var sauceLaunchers = {
- sl_chrome: {
- base: 'SauceLabs',
- browserName: 'chrome',
- },
-
- sl_firefox: {
- base: 'SauceLabs',
- browserName: 'firefox',
- },
-
- sl_safari: {
- base: 'SauceLabs',
- browserName: 'safari',
- platform: 'OS X 10.11',
- version: '9.0',
- },
-
- sl_edge: {
- base: 'SauceLabs',
- browserName: 'MicrosoftEdge',
- },
-};
-
-var localLaunchers = {
- localFirefox: {
- base: 'Firefox',
- },
-};
-
-var customLaunchers = {};
-
-if (process.env['SAUCE_USERNAME'] && process.env['SAUCE_ACCESS_KEY']) {
- customLaunchers = sauceLaunchers;
-} else {
- console.error('Sauce Labs account details not set, ' +
- 'Karma tests will be run only against local browsers.' +
- 'Set SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables to ' +
- 'run tests against Sauce Labs browsers');
- customLaunchers = localLaunchers;
-}
-
-module.exports = function(config) {
- config.set({
- basePath: '../',
-
- frameworks: ['mocha', 'chai'],
-
- files: [
- {
- pattern: WOMBAT_JS_PATH,
- watched: true,
- included: false,
- served: true,
- },
- {
- pattern: 'karma-tests/dummy.html',
- included: false,
- served: true,
- },
- 'karma-tests/*.spec.js',
- ],
-
- preprocessors: {},
-
- reporters: ['progress'],
-
- port: 9876,
-
- colors: true,
-
- logLevel: config.LOG_INFO,
-
- autoWatch: true,
-
- sauceLabs: sauceLabsConfig,
-
- // Set extended timeouts to account for the slowness
- // in connecting to remote browsers (eg. when using
- // Sauce Labs)
- //
- // See https://oligofren.wordpress.com/2014/05/27/running-karma-tests-on-browserstack/
- captureTimeout: 3 * 60000,
- browserNoActivityTimeout: 30 * 1000,
- browserDisconnectTimeout: 10 * 1000,
- browserDisconnectTolerance: 1,
-
- customLaunchers: customLaunchers,
-
- browsers: Object.keys(customLaunchers),
-
- singleRun: false,
-
- concurrency: Infinity
- })
-};
diff --git a/karma-tests/wombat.spec.js b/karma-tests/wombat.spec.js
deleted file mode 100644
index 4204389f..00000000
--- a/karma-tests/wombat.spec.js
+++ /dev/null
@@ -1,225 +0,0 @@
-var DEFAULT_TIMEOUT = 20000;
-
-// creates a new document in an