diff --git a/briar-tests/build.xml b/briar-tests/build.xml
index 72b05fd9b..685482994 100644
--- a/briar-tests/build.xml
+++ b/briar-tests/build.xml
@@ -106,7 +106,7 @@
 			<test name='org.briarproject.data.ReaderImplTest'/>
 			<test name='org.briarproject.data.WriterImplTest'/>
 			<test name='org.briarproject.db.BasicH2Test'/>
-			<test name='org.briarproject.db.DatabaseComponentTest'/>
+			<test name='org.briarproject.db.DatabaseComponentImplTest'/>
 			<test name='org.briarproject.db.ExponentialBackoffTest'/>
 			<test name='org.briarproject.lifecycle.ShutdownManagerImplTest'/>
 			<test name='org.briarproject.lifecycle.WindowsShutdownManagerImplTest'/>
diff --git a/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java b/briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
similarity index 99%
rename from briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
rename to briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
index f2967c2bc..5f1b36ed2 100644
--- a/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
+++ b/briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
@@ -64,7 +64,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-public class DatabaseComponentTest extends BriarTestCase {
+public class DatabaseComponentImplTest extends BriarTestCase {
 
 	protected final Object txn = new Object();
 	protected final GroupId groupId;
@@ -85,7 +85,7 @@ public class DatabaseComponentTest extends BriarTestCase {
 	protected final ContactId contactId;
 	protected final Contact contact;
 
-	public DatabaseComponentTest() {
+	public DatabaseComponentImplTest() {
 		groupId = new GroupId(TestUtils.getRandomId());
 		group = new Group(groupId, "Group", new byte[GROUP_SALT_LENGTH]);
 		authorId = new AuthorId(TestUtils.getRandomId());