diff --git a/package.json b/package.json
index 9c54292a..c69409f9 100644
--- a/package.json
+++ b/package.json
@@ -61,8 +61,7 @@
 		"is-coordinates": "^2.0.2",
 		"is-roughly-equal": "^0.1.0",
 		"tap-spec": "^5.0.0",
-		"tape": "^4.8.0",
-		"tape-promise": "^4.0.0",
+		"tape": "^5.0.0",
 		"validate-fptf": "^3.0.0",
 		"vbb-stations-autocomplete": "^4.1.0"
 	},
diff --git a/test/bvg-journey.js b/test/bvg-journey.js
index 951dfdf7..93ee6175 100644
--- a/test/bvg-journey.js
+++ b/test/bvg-journey.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/bvg')
 const res = require('./fixtures/bvg-journey.json')
 const expected = require('./fixtures/bvg-journey.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client
 
diff --git a/test/bvg-radar.js b/test/bvg-radar.js
index c5186e44..219809da 100644
--- a/test/bvg-radar.js
+++ b/test/bvg-radar.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/bvg')
 const res = require('./fixtures/bvg-radar.json')
 const expected = require('./fixtures/bvg-radar.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client
 
diff --git a/test/db-arrivals.js b/test/db-arrivals.js
index afc09a14..a0f17a99 100644
--- a/test/db-arrivals.js
+++ b/test/db-arrivals.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/db')
 const res = require('./fixtures/db-arrivals.json')
 const expected = require('./fixtures/db-arrivals.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client
 
diff --git a/test/db-journey.js b/test/db-journey.js
index 01bc0eb9..3bd51599 100644
--- a/test/db-journey.js
+++ b/test/db-journey.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/db')
 const res = require('./fixtures/db-journey.json')
 const expected = require('./fixtures/db-journey.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client
 
diff --git a/test/db-stop.js b/test/db-stop.js
index df692e77..b9a36519 100644
--- a/test/db-stop.js
+++ b/test/db-stop.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/db')
 const res = require('./fixtures/db-stop.json')
 const expected = require('./fixtures/db-stop.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client
 
diff --git a/test/e2e/bvg.js b/test/e2e/bvg.js
index 7aaf779f..42b1f5ce 100644
--- a/test/e2e/bvg.js
+++ b/test/e2e/bvg.js
@@ -3,10 +3,7 @@
 // todo: DRY with vbb tests
 
 const stations = require('vbb-stations-autocomplete')
-const a = require('assert')
 const shorten = require('vbb-short-station-name')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 const {DateTime} = require('luxon')
 const flatMap = require('lodash/flatMap')
@@ -23,6 +20,7 @@ const {
 	validateDeparture,
 	validateMovement
 } = require('./lib/vbb-bvg-validators')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -54,7 +52,6 @@ const validate = createValidate(cfg, {
 	movement: validateMovement
 })
 
-const test = tapePromise(tape)
 const client = createClient(bvgProfile, 'public-transport/hafas-client:test')
 
 const amrumerStr = '900000009101'
diff --git a/test/e2e/cfl.js b/test/e2e/cfl.js
index 1e481ea5..06766b3d 100644
--- a/test/e2e/cfl.js
+++ b/test/e2e/cfl.js
@@ -1,8 +1,6 @@
 'use strict'
 
 const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -15,6 +13,7 @@ const {
 	movement: _validateMovement
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -67,7 +66,6 @@ const validate = createValidate(cfg, {
 	movement: validateMovement
 })
 
-const test = tapePromise(tape)
 const client = createClient(cflProfile, 'public-transport/hafas-client:test')
 
 const ettelbruck = '9258199'
diff --git a/test/e2e/cmta.js b/test/e2e/cmta.js
index bb19bc59..8d1092f0 100644
--- a/test/e2e/cmta.js
+++ b/test/e2e/cmta.js
@@ -1,14 +1,11 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const cmtaProfile = require('../../p/cmta')
 const products = require('../../p/cmta/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -34,7 +31,6 @@ const cfg = {
 
 const validate = createValidate(cfg)
 
-const test = tapePromise(tape)
 const client = createClient(cmtaProfile, 'public-transport/hafas-client:test')
 
 const broadieOaks = '2370'
diff --git a/test/e2e/db-busradar-nrw.js b/test/e2e/db-busradar-nrw.js
index af2f8e72..cb6b48a9 100644
--- a/test/e2e/db-busradar-nrw.js
+++ b/test/e2e/db-busradar-nrw.js
@@ -1,13 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const dbBusradarNrwProfile = require('../../p/db-busradar-nrw')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testDepartures = require('./lib/departures')
 const testArrivals = require('./lib/arrivals')
 
@@ -27,7 +26,6 @@ const cfg = {
 
 const validate = createValidate(cfg, {})
 
-const test = tapePromise(tape)
 const client = createClient(dbBusradarNrwProfile, 'public-transport/hafas-client:test')
 
 const hagenBauhaus = '3307002'
diff --git a/test/e2e/db.js b/test/e2e/db.js
index fb99b280..fdebe7e3 100644
--- a/test/e2e/db.js
+++ b/test/e2e/db.js
@@ -1,9 +1,6 @@
 'use strict'
 
 const {full: readStations} = require('db-stations')
-const a = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -15,6 +12,7 @@ const {
 	trip: createValidateTrip
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -79,7 +77,6 @@ const assertValidPrice = (t, p) => {
 	}
 }
 
-const test = tapePromise(tape)
 const client = createClient(dbProfile, 'public-transport/hafas-client:test')
 
 const berlinHbf = '8011160'
diff --git a/test/e2e/hvv.js b/test/e2e/hvv.js
index 0bcc8acf..d5d25f89 100644
--- a/test/e2e/hvv.js
+++ b/test/e2e/hvv.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -9,6 +7,7 @@ const createClient = require('../..')
 const hvvProfile = require('../../p/hvv')
 const products = require('../../p/hvv/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const journeysFailsWithNoProduct = require('./lib/journeys-fails-with-no-product')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
@@ -32,7 +31,6 @@ const cfg = {
 
 const validate = createValidate(cfg, {})
 
-const test = tapePromise(tape)
 const client = createClient(hvvProfile, 'public-transport/hafas-client:test')
 
 const tiefstack = '4117'
diff --git a/test/e2e/insa.js b/test/e2e/insa.js
index 9d5583d7..1c2847c1 100644
--- a/test/e2e/insa.js
+++ b/test/e2e/insa.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -9,6 +7,7 @@ const createClient = require('../..')
 const insaProfile = require('../../p/insa')
 const products = require('../../p/insa/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -35,7 +34,6 @@ const cfg = {
 
 const validate = createValidate(cfg, {})
 
-const test = tapePromise(tape)
 const client = createClient(insaProfile, 'public-transport/hafas-client:test')
 
 const magdeburgHbf = '8010224'
diff --git a/test/e2e/invg.js b/test/e2e/invg.js
index 35f8ca74..d848ce58 100644
--- a/test/e2e/invg.js
+++ b/test/e2e/invg.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -13,6 +11,7 @@ const {
 	movement: createValidateMovement
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -45,7 +44,6 @@ const validate = createValidate(cfg, {
 	movement: validateMovement
 })
 
-const test = tapePromise(tape)
 const client = createClient(invgProfile, 'public-transport/hafas-client:test')
 
 const ingolstadtHbf = '8000183'
diff --git a/test/e2e/lib/util.js b/test/e2e/lib/util.js
index c1d42daa..c606c540 100644
--- a/test/e2e/lib/util.js
+++ b/test/e2e/lib/util.js
@@ -3,6 +3,7 @@
 const isRoughlyEqual = require('is-roughly-equal')
 const {DateTime} = require('luxon')
 const a = require('assert')
+const tape = require('tape')
 
 const hour = 60 * 60 * 1000
 const day = 24 * hour
@@ -23,6 +24,9 @@ const assertValidWhen = (actual, expected, name) => {
 	a.ok(isRoughlyEqual(day + 6 * hour, +expected, ts), name + ' is out of range')
 }
 
+const test = tape
+
 module.exports = {
-	hour, createWhen, assertValidWhen
+	hour, createWhen, assertValidWhen,
+	test,
 }
diff --git a/test/e2e/nahsh.js b/test/e2e/nahsh.js
index 189daac7..5673e173 100644
--- a/test/e2e/nahsh.js
+++ b/test/e2e/nahsh.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -13,6 +11,7 @@ const {
 	station: createValidateStation
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -63,7 +62,6 @@ const assertValidPrice = (t, p) => {
 	}
 }
 
-const test = tapePromise(tape)
 const client = createClient(nahshProfile, 'public-transport/hafas-client:test')
 
 const kielHbf = '9049079'
diff --git a/test/e2e/nvv.js b/test/e2e/nvv.js
index b6910ba8..c2f41d33 100644
--- a/test/e2e/nvv.js
+++ b/test/e2e/nvv.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -9,6 +7,7 @@ const createClient = require('../..')
 const nvvProfile = require('../../p/nvv')
 const products = require('../../p/nvv/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const journeysFailsWithNoProduct = require('./lib/journeys-fails-with-no-product')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
@@ -33,7 +32,6 @@ const cfg = {
 }
 const validate = createValidate(cfg, {})
 
-const test = tapePromise(tape)
 const client = createClient(nvvProfile, 'public-transport/hafas-client:test')
 
 const scheidemannplatz = '2200073'
diff --git a/test/e2e/oebb.js b/test/e2e/oebb.js
index 1df3b59f..9e1861b4 100644
--- a/test/e2e/oebb.js
+++ b/test/e2e/oebb.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 const validateLine = require('validate-fptf/line')
 
@@ -14,6 +12,7 @@ const {
 	stop: validateStop
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -53,7 +52,6 @@ const assertValidPrice = (t, p) => {
 	}
 }
 
-const test = tapePromise(tape)
 const client = createClient(oebbProfile, 'public-transport/hafas-client:test')
 
 const salzburgHbf = '8100002'
diff --git a/test/e2e/pkp.js b/test/e2e/pkp.js
index b448ca7c..4490ed84 100644
--- a/test/e2e/pkp.js
+++ b/test/e2e/pkp.js
@@ -1,9 +1,5 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const { createWhen } = require('./lib/util')
 const createClient = require('../..')
 const pkpProfile = require('../../p/pkp')
@@ -14,6 +10,7 @@ const {
 	movement: _validateMovement
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testArrivals = require('./lib/arrivals')
 const testReachableFrom = require('./lib/reachable-from')
@@ -53,7 +50,6 @@ const validate = createValidate(cfg, {
 	movement: validateMovement
 })
 
-const test = tapePromise(tape)
 const client = createClient(pkpProfile, 'public-transport/hafas-client:test')
 
 const wrocławGł = '5100069'
diff --git a/test/e2e/rmv.js b/test/e2e/rmv.js
index b94ffa71..51b38d86 100644
--- a/test/e2e/rmv.js
+++ b/test/e2e/rmv.js
@@ -1,14 +1,11 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const rmvProfile = require('../../p/rmv')
 const products = require('../../p/rmv/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testRefreshJourney = require('./lib/refresh-journey')
 const testArrivals = require('./lib/arrivals')
@@ -28,7 +25,6 @@ const cfg = {
 
 const validate = createValidate(cfg)
 
-const test = tapePromise(tape)
 const client = createClient(rmvProfile, 'public-transport/hafas-client:test')
 
 const frankfurtOstendstr = '3000525'
diff --git a/test/e2e/rsag.js b/test/e2e/rsag.js
index 7997419c..1fffe931 100644
--- a/test/e2e/rsag.js
+++ b/test/e2e/rsag.js
@@ -1,14 +1,11 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const rsagProfile = require('../../p/rsag')
 const products = require('../../p/rsag/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testEarlierLaterJourneys = require('./lib/earlier-later-journeys')
 const testRefreshJourney = require('./lib/refresh-journey')
@@ -29,7 +26,6 @@ const cfg = {
 
 const validate = createValidate(cfg)
 
-const test = tapePromise(tape)
 const client = createClient(rsagProfile, 'public-transport/hafas-client:test')
 
 const sternwarte = '704956'
diff --git a/test/e2e/saarfahrplan.js b/test/e2e/saarfahrplan.js
index 184e6c9f..a7c224f7 100644
--- a/test/e2e/saarfahrplan.js
+++ b/test/e2e/saarfahrplan.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const { createWhen } = require('./lib/util')
@@ -13,6 +11,7 @@ const {
 	stop: validateStop
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -51,7 +50,6 @@ const assertValidPrice = (t, p) => {
 	}
 }
 
-const test = tapePromise(tape)
 const client = createClient(saarfahrplanProfile, 'public-transport/hafas-client:test')
 
 const saarbrueckenHbf = '8000323'
diff --git a/test/e2e/sbahn-muenchen.js b/test/e2e/sbahn-muenchen.js
index 00f13b19..84ee4cf0 100644
--- a/test/e2e/sbahn-muenchen.js
+++ b/test/e2e/sbahn-muenchen.js
@@ -1,15 +1,12 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const sMunichProfile = require('../../p/sbahn-muenchen')
 const products = require('../../p/sbahn-muenchen/products')
 const {movement: _validateMovement} = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -50,7 +47,6 @@ const validate = createValidate(cfg, {
 	movement: validateMovement
 })
 
-const test = tapePromise(tape)
 const client = createClient(sMunichProfile, 'public-transport/hafas-client:test')
 
 const mittersendling = '8004154'
diff --git a/test/e2e/sncb.js b/test/e2e/sncb.js
index 7a6079c4..fa9c2ef3 100644
--- a/test/e2e/sncb.js
+++ b/test/e2e/sncb.js
@@ -1,14 +1,11 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const sncbProfile = require('../../p/sncb')
 const products = require('../../p/sncb/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testRefreshJourney = require('./lib/refresh-journey')
 const testArrivals = require('./lib/arrivals')
@@ -28,7 +25,6 @@ const cfg = {
 
 const validate = createValidate(cfg)
 
-const test = tapePromise(tape)
 const client = createClient(sncbProfile, 'public-transport/hafas-client:test')
 
 const gentStPieters = '8892007'
diff --git a/test/e2e/svv.js b/test/e2e/svv.js
index 8a069cd4..bc8f6cbc 100644
--- a/test/e2e/svv.js
+++ b/test/e2e/svv.js
@@ -1,14 +1,11 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const svvProfile = require('../../p/svv')
 const products = require('../../p/svv/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testRefreshJourney = require('./lib/refresh-journey')
 const testArrivals = require('./lib/arrivals')
@@ -28,7 +25,6 @@ const cfg = {
 
 const validate = createValidate(cfg)
 
-const test = tapePromise(tape)
 const client = createClient(svvProfile, 'public-transport/hafas-client:test')
 
 const sam = '455086100'
diff --git a/test/e2e/vbb.js b/test/e2e/vbb.js
index 75fef309..f28291a1 100644
--- a/test/e2e/vbb.js
+++ b/test/e2e/vbb.js
@@ -1,8 +1,5 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const createClient = require('../..')
 const vbbProfile = require('../../p/vbb')
 const products = require('../../p/vbb/products')
@@ -15,6 +12,7 @@ const {
 	validateMovement
 } = require('./lib/vbb-bvg-validators')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -39,7 +37,6 @@ const validate = createValidate(cfg, {
 	movement: validateMovement
 })
 
-const test = tapePromise(tape)
 const client = createClient(vbbProfile, 'public-transport/hafas-client:test')
 
 const amrumerStr = '900000009101'
@@ -139,7 +136,6 @@ test('journeys: walkingSpeed', async (t) => {
 		products: {bus: false},
 		minTimeDifference: 5 * 60 * 1000
 	})
-	t.end()
 })
 
 test('earlier/later journeys', async (t) => {
diff --git a/test/e2e/vbn.js b/test/e2e/vbn.js
index f2f4abc1..c856aea6 100644
--- a/test/e2e/vbn.js
+++ b/test/e2e/vbn.js
@@ -1,14 +1,11 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
-
 const {createWhen} = require('./lib/util')
 const createClient = require('../..')
 const vbnProfile = require('../../p/vbn')
 const products = require('../../p/vbn/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testRefreshJourney = require('./lib/refresh-journey')
 const testArrivals = require('./lib/arrivals')
@@ -28,7 +25,6 @@ const cfg = {
 
 const validate = createValidate(cfg)
 
-const test = tapePromise(tape)
 const client = createClient(vbnProfile, 'public-transport/hafas-client:test')
 
 const oldenburg = '8000291'
diff --git a/test/e2e/vsn.js b/test/e2e/vsn.js
index 0b73ff7e..afe7a611 100644
--- a/test/e2e/vsn.js
+++ b/test/e2e/vsn.js
@@ -1,8 +1,5 @@
 'use strict'
 
-const assert = require('assert')
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
 const isRoughlyEqual = require('is-roughly-equal')
 
 const {createWhen} = require('./lib/util')
@@ -10,6 +7,7 @@ const createClient = require('../..')
 const vsnProfile = require('../../p/vsn')
 const products = require('../../p/vsn/products')
 const createValidate = require('./lib/validate-fptf-with')
+const {test} = require('./lib/util')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
 const testJourneysStationToAddress = require('./lib/journeys-station-to-address')
 const testJourneysStationToPoi = require('./lib/journeys-station-to-poi')
@@ -30,7 +28,6 @@ const cfg = {
 
 const validate = createValidate(cfg)
 
-const test = tapePromise(tape)
 const client = createClient(vsnProfile, 'public-transport/hafas-client:test')
 
 const kornmarkt = '9033977'
diff --git a/test/fixtures/bvg-journey.js b/test/fixtures/bvg-journey.js
index 42fbea9f..990aa0c2 100644
--- a/test/fixtures/bvg-journey.js
+++ b/test/fixtures/bvg-journey.js
@@ -695,6 +695,7 @@ module.exports = {
 			fahrtNr: '14825',
 			name: 'S2',
 			public: true,
+			adminCode: 'DBS',
 			mode: 'train',
 			product: 'suburban',
 			operator: {
@@ -702,7 +703,6 @@ module.exports = {
 				id: 's-bahn-berlin-gmbh',
 				name: 'S-Bahn Berlin GmbH'
 			},
-			adminCode: 'DBS',
 			symbol: 'S',
 			nr: 2,
 			metro: false,
@@ -960,7 +960,7 @@ module.exports = {
 	cycle: {
 		min: 300
 	},
-	scheduledDays: {
+	scheduledDays: Object.assign(Object.create(null), {
 		'2019-01-01': true,
 		'2019-01-02': true,
 		'2019-01-03': true,
@@ -1089,5 +1089,5 @@ module.exports = {
 		'2019-05-06': true,
 		'2019-05-07': false,
 		'2019-05-08': false
-	}
+	}),
 }
diff --git a/test/insa-stop.js b/test/insa-stop.js
index b89896ff..aab7983c 100644
--- a/test/insa-stop.js
+++ b/test/insa-stop.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/insa')
 const res = require('./fixtures/insa-stop.json')
 const expected = require('./fixtures/insa-stop.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client
 
diff --git a/test/oebb-trip.js b/test/oebb-trip.js
index bafda863..3bb44fa8 100644
--- a/test/oebb-trip.js
+++ b/test/oebb-trip.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/oebb')
 const res = require('./fixtures/oebb-trip.json')
 const expected = require('./fixtures/oebb-trip.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client
 
diff --git a/test/throttle.js b/test/throttle.js
index 3de45479..fb5f79d0 100644
--- a/test/throttle.js
+++ b/test/throttle.js
@@ -1,7 +1,6 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const withThrottling = require('../throttle')
@@ -11,9 +10,7 @@ const depsRes = require('./fixtures/vbb-departures.json')
 const ua = 'public-transport/hafas-client:test'
 const spichernstr = '900000042101'
 
-const test = tapePromise(tape)
-
-test('withThrottling works', async (t) => {
+test('withThrottling works', {timeout: 2600}, (t) => {
 	let calls = 0
 	const mockedRequest = async (ctx, userAgent, reqData) => {
 		calls++
diff --git a/test/vbb-departures.js b/test/vbb-departures.js
index c2effa20..e636ba8f 100644
--- a/test/vbb-departures.js
+++ b/test/vbb-departures.js
@@ -1,14 +1,12 @@
 'use strict'
 
-const tapePromise = require('tape-promise').default
-const tape = require('tape')
+const test = require('tape')
 
 const createClient = require('..')
 const rawProfile = require('../p/vbb')
 const res = require('./fixtures/vbb-departures.json')
 const expected = require('./fixtures/vbb-departures.js')
 
-const test = tapePromise(tape)
 const client = createClient(rawProfile, 'public-transport/hafas-client:test')
 const {profile} = client