diff --git a/chained-batch.js b/chained-batch.js
index fadc76d4..0b917672 100644
--- a/chained-batch.js
+++ b/chained-batch.js
@@ -19,7 +19,7 @@ ChainedBatch.prototype._clear = function (key) {
 }
 
 ChainedBatch.prototype._write = function (options, callback) {
-  this.binding.write(options, callback)
+  this.binding.write(callback)
 }
 
 util.inherits(ChainedBatch, AbstractChainedBatch)
diff --git a/package.json b/package.json
index 5d4d1b4c..2993d766 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   ],
   "main": "leveldown.js",
   "dependencies": {
-    "abstract-leveldown": "level/abstract-leveldown#master",
+    "abstract-leveldown": "level/abstract-leveldown#d7411bb",
     "bindings": "~1.3.0",
     "fast-future": "~1.0.2",
     "nan": "~2.10.0",
diff --git a/test/abstract-leveldown-test.js b/test/abstract-leveldown-test.js
new file mode 100644
index 00000000..12888ea0
--- /dev/null
+++ b/test/abstract-leveldown-test.js
@@ -0,0 +1 @@
+require('abstract-leveldown/test')(require('./common'))
diff --git a/test/batch-test.js b/test/batch-test.js
deleted file mode 100644
index 4594c48a..00000000
--- a/test/batch-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/batch-test')
-
-abstract.all(testCommon.factory, test)
diff --git a/test/chained-batch-test.js b/test/chained-batch-test.js
deleted file mode 100644
index a8adb35d..00000000
--- a/test/chained-batch-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/chained-batch-test')
-
-abstract.all(testCommon.factory, test)
diff --git a/test/close-test.js b/test/close-test.js
deleted file mode 100644
index 5e873e22..00000000
--- a/test/close-test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/close-test')
-
-test('setUp', testCommon.setUp)
-
-abstract.close(testCommon.factory, test, testCommon)
-
-test('tearDown', testCommon.tearDown)
diff --git a/test/common.js b/test/common.js
index d905eb6f..4c55d8b0 100644
--- a/test/common.js
+++ b/test/common.js
@@ -1,9 +1,10 @@
-const testCommon = require('abstract-leveldown/test/common')
+const test = require('tape')
 const tempy = require('tempy')
 const leveldown = require('..')
 
-testCommon.factory = function () {
-  return leveldown(tempy.directory())
-}
-
-module.exports = testCommon
+module.exports = require('abstract-leveldown/test/common')({
+  test: test,
+  factory: function () {
+    return leveldown(tempy.directory())
+  }
+})
diff --git a/test/del-test.js b/test/del-test.js
deleted file mode 100644
index 8ca70133..00000000
--- a/test/del-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/del-test')
-
-abstract.all(testCommon.factory, test)
diff --git a/test/get-test.js b/test/get-test.js
deleted file mode 100644
index 50ed52a2..00000000
--- a/test/get-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/get-test')
-
-abstract.all(testCommon.factory, test)
diff --git a/test/iterator-range-test.js b/test/iterator-range-test.js
deleted file mode 100644
index d8595355..00000000
--- a/test/iterator-range-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/iterator-range-test')
-
-abstract.all(testCommon.factory, test)
diff --git a/test/iterator-test.js b/test/iterator-test.js
index 6a2f49fd..b2395fe9 100644
--- a/test/iterator-test.js
+++ b/test/iterator-test.js
@@ -1,13 +1,8 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/iterator-test')
 const make = require('./make')
 const iota = require('iota-array')
 const lexi = require('lexicographic-integer')
 const util = require('util')
 
-abstract.all(testCommon.factory, test)
-
 make('iterator throws if key is not a string or buffer', function (db, t, done) {
   var keys = [null, undefined, 1, true, false]
   var pending = keys.length
diff --git a/test/leveldown-test.js b/test/leveldown-test.js
index 44df42c2..bf002307 100644
--- a/test/leveldown-test.js
+++ b/test/leveldown-test.js
@@ -1,10 +1,6 @@
 const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/leveldown-test')
 const leveldown = require('..')
 
-abstract.args(testCommon.factory, test)
-
 test('test database creation non-string location throws', function (t) {
   t.throws(
     leveldown.bind(null, {}),
diff --git a/test/open-test.js b/test/open-test.js
deleted file mode 100644
index 7d16bc89..00000000
--- a/test/open-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/open-test')
-
-abstract.all(testCommon.factory, test)
diff --git a/test/put-get-del-test.js b/test/put-get-del-test.js
deleted file mode 100644
index 1317688b..00000000
--- a/test/put-get-del-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/put-get-del-test')
-
-abstract.all(testCommon.factory, test)
diff --git a/test/put-test.js b/test/put-test.js
deleted file mode 100644
index b7983230..00000000
--- a/test/put-test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const test = require('tape')
-const testCommon = require('./common')
-const abstract = require('abstract-leveldown/test/put-test')
-
-abstract.all(testCommon.factory, test)