diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java
similarity index 96%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceComparisonTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java
index ea8710bafbe9789c79e66e984ca04c393f343ede..c2a124bb299c1729be0e9c83da3ad7555c65b82c 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java
@@ -18,8 +18,8 @@ import static org.briarproject.bramble.test.TestUtils.getMedian;
 import static org.briarproject.bramble.test.TestUtils.getStandardDeviation;
 import static org.briarproject.bramble.test.UTest.Z_CRITICAL_0_01;
 
-public abstract class JdbcDatabasePerformanceComparisonTest
-		extends JdbcDatabasePerformanceTest {
+public abstract class DatabasePerformanceComparisonTest
+		extends DatabasePerformanceTest {
 
 	/**
 	 * How many blocks of each condition to compare.
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java
similarity index 99%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java
index ffb6ed965de6357ef9ef705ea6dde67b2ee48242..840af855c386e1f666d56b6b1d69b9158478f76b 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java
@@ -45,7 +45,7 @@ import static org.briarproject.bramble.test.UTest.Z_CRITICAL_0_1;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertTrue;
 
-public abstract class JdbcDatabasePerformanceTest extends BrambleTestCase {
+public abstract class DatabasePerformanceTest extends BrambleTestCase {
 
 	private static final int ONE_MEGABYTE = 1024 * 1024;
 	static final int MAX_SIZE = 100 * ONE_MEGABYTE;
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTraceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java
similarity index 95%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTraceTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java
index 3fb2d434265a81db67ecd542cceeca22f4f16c81..a78fb5f55a4aa93fd3929bd6e583c5e6a676cf6c 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTraceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java
@@ -17,8 +17,7 @@ import javax.annotation.Nullable;
 
 import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 
-public abstract class JdbcDatabaseTraceTest
-		extends JdbcDatabasePerformanceTest {
+public abstract class DatabaseTraceTest extends DatabasePerformanceTest {
 
 	abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
 			Clock clock);
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java
index 61397559e623e515fff8c41c8c921b9d79bb9356..fdac3e58c93f61f0b072929762a4d210ec6b4ce2 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java
@@ -5,8 +5,7 @@ import org.briarproject.bramble.api.system.Clock;
 import org.junit.Ignore;
 
 @Ignore
-public class H2DatabasePerformanceTest
-		extends JdbcSingleDatabasePerformanceTest {
+public class H2DatabasePerformanceTest extends SingleDatabasePerformanceTest {
 
 	@Override
 	protected String getTestName() {
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java
index 885613d4dcad0abfab1b27b63cec822978441cdd..2b12f88b03ff148e2f6a9556de786fb612608152 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java
@@ -10,7 +10,7 @@ import java.sql.Connection;
 import javax.annotation.Nonnull;
 
 @Ignore
-public class H2DatabaseTraceTest extends JdbcDatabaseTraceTest {
+public class H2DatabaseTraceTest extends DatabaseTraceTest {
 
 	@Override
 	Database<Connection> createDatabase(DatabaseConfig databaseConfig,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java
index c83675713b74235c7488d5170f67f949fbd5e293..b51cca72a8a04c38a8d01df3f24af1435cd1c7e9 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java
@@ -8,7 +8,7 @@ import java.sql.Connection;
 
 @Ignore
 public class H2HyperSqlDatabasePerformanceComparisonTest
-		extends JdbcDatabasePerformanceComparisonTest {
+		extends DatabasePerformanceComparisonTest {
 
 	@Override
 	Database<Connection> createDatabase(boolean conditionA,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java
index a7c483512c482a7daa6be1fd45d830d071f692f1..4fb686043fbd4d6e3887d163983f1a2b6dba4a6d 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java
@@ -7,13 +7,13 @@ import org.junit.Ignore;
 import java.sql.Connection;
 
 /**
- * Sanity check for {@link JdbcDatabasePerformanceComparisonTest}: check that
+ * Sanity check for {@link DatabasePerformanceComparisonTest}: check that
  * if conditions A and B are identical, no significant difference is (usually)
  * detected.
  */
 @Ignore
 public class H2SelfDatabasePerformanceComparisonTest
-		extends JdbcDatabasePerformanceComparisonTest {
+		extends DatabasePerformanceComparisonTest {
 
 	@Override
 	Database<Connection> createDatabase(boolean conditionA,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java
index 4bc215c28b286bd678a4ccadcb2dab58db7107b3..73d382bc5192956da0a420b1d66fd04a3b4d9473 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java
@@ -9,13 +9,13 @@ import org.junit.Ignore;
 import java.sql.Connection;
 
 /**
- * Sanity check for {@link JdbcDatabasePerformanceComparisonTest}: check that
+ * Sanity check for {@link DatabasePerformanceComparisonTest}: check that
  * if condition B sleeps for 1ms before every commit, condition A is
  * considered to be faster.
  */
 @Ignore
 public class H2SleepDatabasePerformanceComparisonTest
-		extends JdbcDatabasePerformanceComparisonTest {
+		extends DatabasePerformanceComparisonTest {
 
 	@Override
 	Database<Connection> createDatabase(boolean conditionA,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java
index 29585d5c9fe5cc9226bd76f8d28a1728c8dde4b2..39c69f3d795c0dd1a0c63275b868f250352021c2 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java
@@ -6,7 +6,7 @@ import org.junit.Ignore;
 
 @Ignore
 public class HyperSqlDatabasePerformanceTest
-		extends JdbcSingleDatabasePerformanceTest {
+		extends SingleDatabasePerformanceTest {
 
 	@Override
 	protected String getTestName() {
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcSingleDatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java
similarity index 95%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcSingleDatabasePerformanceTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java
index 2356d9346a884e19e42766185b40f9f6dc62a11a..5a836476782da918dc9047721839c60402f5a76b 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcSingleDatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java
@@ -15,8 +15,8 @@ import static org.briarproject.bramble.test.TestUtils.getMean;
 import static org.briarproject.bramble.test.TestUtils.getMedian;
 import static org.briarproject.bramble.test.TestUtils.getStandardDeviation;
 
-public abstract class JdbcSingleDatabasePerformanceTest
-		extends JdbcDatabasePerformanceTest {
+public abstract class SingleDatabasePerformanceTest
+		extends DatabasePerformanceTest {
 
 	abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
 			Clock clock);