diff --git a/briar-tests/src/org/briarproject/data/MetadataEncoderParserImplTest.java b/briar-tests/src/org/briarproject/data/MetadataEncoderParserIntegrationTest.java
similarity index 98%
rename from briar-tests/src/org/briarproject/data/MetadataEncoderParserImplTest.java
rename to briar-tests/src/org/briarproject/data/MetadataEncoderParserIntegrationTest.java
index d4dd555d0a6639e558f4a50998ec15bf7d73c60f..3139ad598373f836e2fc50324c62df898d390ce1 100644
--- a/briar-tests/src/org/briarproject/data/MetadataEncoderParserImplTest.java
+++ b/briar-tests/src/org/briarproject/data/MetadataEncoderParserIntegrationTest.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-public class MetadataEncoderParserImplTest extends BriarTestCase {
+public class MetadataEncoderParserIntegrationTest extends BriarTestCase {
 
 	MetadataEncoderImpl e;
 	MetadataParserImpl p;
diff --git a/briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java b/briar-tests/src/org/briarproject/transport/StreamReaderWriterIntegrationTest.java
similarity index 97%
rename from briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java
rename to briar-tests/src/org/briarproject/transport/StreamReaderWriterIntegrationTest.java
index 0fa3d3cd34714f67d651419cdb9ff7d1d17348b3..bf013fd2defac7db76baa66276ea6f6f51abcc1b 100644
--- a/briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/transport/StreamReaderWriterIntegrationTest.java
@@ -19,7 +19,7 @@ import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-public class TransportIntegrationTest extends BriarTestCase {
+public class StreamReaderWriterIntegrationTest extends BriarTestCase {
 
 	@Test
 	public void testWriteAndRead() throws Exception {