diff --git a/test/tap/categoryFilter-test.js b/test/tap/categoryFilter-test.js
new file mode 100644
index 0000000..4cd1043
--- /dev/null
+++ b/test/tap/categoryFilter-test.js
@@ -0,0 +1,78 @@
+'use strict';
+
+const test = require('tap').test;
+const fs = require('fs');
+const EOL = require('os').EOL || '\n';
+const log4js = require('../../lib/log4js');
+
+function remove(filename) {
+  try {
+    fs.unlinkSync(filename);
+  } catch (e) {
+    // doesn't really matter if it failed
+  }
+}
+
+function cleanup(done) {
+  remove(`${__dirname}/categoryFilter-web.log`);
+  remove(`${__dirname}/categoryFilter-noweb.log`);
+  done();
+}
+
+test('log4js categoryFilter', (batch) => {
+  batch.beforeEach(cleanup);
+
+  batch.test('appender should exclude categories', (t) => {
+    const logEvents = [];
+    const appender = require(
+      '../../lib/appenders/categoryFilter'
+    ).appender(
+      ['app'],
+      (evt) => {
+        logEvents.push(evt);
+      }
+    );
+    log4js.clearAppenders();
+    log4js.addAppender(appender, ['app', 'web']);
+
+    const webLogger = log4js.getLogger('web');
+    const appLogger = log4js.getLogger('app');
+
+    webLogger.debug('This should get logged');
+    appLogger.debug('This should not');
+    webLogger.debug('Hello again');
+    log4js.getLogger('db').debug('This shouldn\'t be included by the appender anyway');
+
+    t.equal(logEvents.length, 2);
+    t.equal(logEvents[0].data[0], 'This should get logged');
+    t.equal(logEvents[1].data[0], 'Hello again');
+    t.end();
+  });
+
+  batch.test('should work with configuration file', (t) => {
+    log4js.configure('test/tap/with-categoryFilter.json');
+    const logger = log4js.getLogger('app');
+    const weblogger = log4js.getLogger('web');
+
+    logger.info('Loading app');
+    logger.info('Initialising indexes');
+    weblogger.info('00:00:00 GET / 200');
+    weblogger.warn('00:00:00 GET / 500');
+
+    setTimeout(() => {
+      fs.readFile(`${__dirname}/categoryFilter-noweb.log`, 'utf8', (err, contents) => {
+        const noWebMessages = contents.trim().split(EOL);
+        t.same(noWebMessages, ['Loading app', 'Initialising indexes']);
+
+        fs.readFile(`${__dirname}/categoryFilter-web.log`, 'utf8', (e, c) => {
+          const messages = c.trim().split(EOL);
+          t.same(messages, ['00:00:00 GET / 200', '00:00:00 GET / 500']);
+          t.end();
+        });
+      });
+    }, 500);
+  });
+
+  batch.afterEach(cleanup);
+  batch.end();
+});
diff --git a/test/vows/with-categoryFilter.json b/test/tap/with-categoryFilter.json
similarity index 74%
rename from test/vows/with-categoryFilter.json
rename to test/tap/with-categoryFilter.json
index 5cde0c6..f1efa4a 100644
--- a/test/vows/with-categoryFilter.json
+++ b/test/tap/with-categoryFilter.json
@@ -5,7 +5,7 @@
       "exclude": "web",
       "appender": {
         "type": "file",
-        "filename": "test/vows/categoryFilter-noweb.log",
+        "filename": "test/tap/categoryFilter-noweb.log",
         "layout": {
           "type": "messagePassThrough"
         }
@@ -14,7 +14,7 @@
     {
       "category": "web",
       "type": "file",
-      "filename": "test/vows/categoryFilter-web.log", 
+      "filename": "test/tap/categoryFilter-web.log", 
       "layout": {
         "type": "messagePassThrough"
       }
diff --git a/test/vows/categoryFilter-test.js b/test/vows/categoryFilter-test.js
deleted file mode 100644
index a3cc7ac..0000000
--- a/test/vows/categoryFilter-test.js
+++ /dev/null
@@ -1,84 +0,0 @@
-'use strict';
-
-const vows = require('vows');
-const fs = require('fs');
-const assert = require('assert');
-const EOL = require('os').EOL || '\n';
-
-function remove(filename) {
-  try {
-    fs.unlinkSync(filename);
-  } catch (e) {
-    // doesn't really matter if it failed
-  }
-}
-
-vows.describe('log4js categoryFilter').addBatch({
-  appender: {
-    topic: function () {
-      const log4js = require('../../lib/log4js');
-      const logEvents = [];
-      log4js.clearAppenders();
-      const appender = require('../../lib/appenders/categoryFilter')
-        .appender(
-          ['app'],
-          (evt) => {
-            logEvents.push(evt);
-          }
-        );
-      log4js.addAppender(appender, ['app', 'web']);
-
-      const webLogger = log4js.getLogger('web');
-      const appLogger = log4js.getLogger('app');
-
-      webLogger.debug('This should get logged');
-      appLogger.debug('This should not');
-      webLogger.debug('Hello again');
-      log4js.getLogger('db').debug('This shouldn\'t be included by the appender anyway');
-
-      return logEvents;
-    },
-    'should only pass matching category': function (logEvents) {
-      assert.equal(logEvents.length, 2);
-      assert.equal(logEvents[0].data[0], 'This should get logged');
-      assert.equal(logEvents[1].data[0], 'Hello again');
-    }
-  },
-
-  configure: {
-    topic: function () {
-      const log4js = require('../../lib/log4js');
-      remove(`${__dirname}/categoryFilter-web.log`);
-      remove(`${__dirname}/categoryFilter-noweb.log`);
-
-      log4js.configure('test/vows/with-categoryFilter.json');
-      const logger = log4js.getLogger('app');
-      const weblogger = log4js.getLogger('web');
-
-      logger.info('Loading app');
-      logger.debug('Initialising indexes');
-      weblogger.info('00:00:00 GET / 200');
-      weblogger.warn('00:00:00 GET / 500');
-      // wait for the file system to catch up
-      setTimeout(this.callback, 500);
-    },
-    'tmp-tests.log': {
-      topic: function () {
-        fs.readFile(`${__dirname}/categoryFilter-noweb.log`, 'utf8', this.callback);
-      },
-      'should contain all log messages': function (contents) {
-        const messages = contents.trim().split(EOL);
-        assert.deepEqual(messages, ['Loading app', 'Initialising indexes']);
-      }
-    },
-    'tmp-tests-web.log': {
-      topic: function () {
-        fs.readFile(`${__dirname}/categoryFilter-web.log`, 'utf8', this.callback);
-      },
-      'should contain only error and warning log messages': function (contents) {
-        const messages = contents.trim().split(EOL);
-        assert.deepEqual(messages, ['00:00:00 GET / 200', '00:00:00 GET / 500']);
-      }
-    }
-  }
-}).export(module);