diff --git a/test/server.js b/test/server.js
index fb68848..2736b16 100644
--- a/test/server.js
+++ b/test/server.js
@@ -8,10 +8,11 @@ var peerId = '01234567890123456789'
 var peerId2 = '12345678901234567890'
 var torrentLength = 50000
 
-test('http server', function (t) {
+function serverTest (t, serverType) {
   t.plan(27)
 
-  var server = new Server({ udp: false }) // { interval: 50000, compactOnly: false }
+  var opts = serverType === 'http' ? { udp: false } : { http: false }
+  var server = new Server(opts)
 
   server.on('error', function (err) {
     t.fail(err.message)
@@ -110,4 +111,12 @@ test('http server', function (t) {
       })
     })
   })
+}
+
+test('http server', function (t) {
+  serverTest(t, 'http')
+})
+
+test('udp server', function (t) {
+  serverTest(t, 'http')
 })
diff --git a/test/udp-server.js b/test/udp-server.js
deleted file mode 100644
index af03bb9..0000000
--- a/test/udp-server.js
+++ /dev/null
@@ -1,113 +0,0 @@
-var Client = require('../')
-var portfinder = require('portfinder')
-var Server = require('../').Server
-var test = require('tape')
-
-var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
-var peerId = '01234567890123456789'
-var peerId2 = '12345678901234567890'
-var torrentLength = 50000
-
-test('udp server', function (t) {
-  t.plan(27)
-
-  var server = new Server({ http: false })
-
-  server.on('error', function (err) {
-    t.fail(err.message)
-  })
-
-  server.on('warning', function (err) {
-    t.fail(err.message)
-  })
-
-  server.on('listening', function () {
-    t.pass('server listening')
-  })
-
-  portfinder.getPort(function (err, port) {
-    t.error(err, 'found free port')
-    server.listen(port)
-
-    var announceUrl = 'udp://127.0.0.1:' + port + '/announce'
-
-    var client = new Client(peerId, 6881, {
-      infoHash: infoHash,
-      length: torrentLength,
-      announce: [ announceUrl ]
-    })
-
-    client.start()
-
-    server.once('start', function () {
-      t.pass('got start message from client1')
-    })
-
-    client.once('update', function (data) {
-      t.equal(data.announce, announceUrl)
-      t.equal(data.complete, 0)
-      t.equal(data.incomplete, 1)
-
-      t.equal(Object.keys(server.torrents).length, 1)
-      t.equal(server.getSwarm(infoHash).complete, 0)
-      t.equal(server.getSwarm(infoHash).incomplete, 1)
-      t.equal(Object.keys(server.getSwarm(infoHash).peers).length, 1)
-      t.deepEqual(server.getSwarm(infoHash).peers['127.0.0.1:6881'], {
-        ip: '127.0.0.1',
-        port: 6881,
-        peerId: peerId
-      })
-
-      client.complete()
-
-      client.once('update', function (data) {
-        t.equal(data.announce, announceUrl)
-        t.equal(data.complete, 1)
-        t.equal(data.incomplete, 0)
-
-        client.scrape()
-
-        client.once('scrape', function (data) {
-          t.equal(data.announce, announceUrl)
-          t.equal(typeof data.complete, 'number')
-          t.equal(typeof data.incomplete, 'number')
-          t.equal(typeof data.downloaded, 'number')
-
-          var client2 = new Client(peerId2, 6882, {
-            infoHash: infoHash,
-            length: torrentLength,
-            announce: [ announceUrl ]
-          })
-
-          client2.start()
-
-          server.once('start', function () {
-            t.pass('got start message from client2')
-          })
-
-          client2.once('peer', function (addr) {
-            t.equal(addr, '127.0.0.1:6881')
-
-            client2.stop()
-            client2.once('update', function (data) {
-              t.equal(data.announce, announceUrl)
-              t.equal(data.complete, 1)
-              t.equal(data.incomplete, 0)
-
-              client.stop()
-              client.once('update', function (data) {
-                t.equal(data.announce, announceUrl)
-                t.equal(data.complete, 0)
-                t.equal(data.incomplete, 0)
-
-                server.close(function () {
-                  t.pass('server close')
-                })
-              })
-            })
-          })
-        })
-      })
-    })
-  })
-})