diff --git a/test/net/sf/briar/transport/batch/ByteArrayBatchTransportReader.java b/test/net/sf/briar/transport/batch/TestBatchTransportReader.java
similarity index 81%
rename from test/net/sf/briar/transport/batch/ByteArrayBatchTransportReader.java
rename to test/net/sf/briar/transport/batch/TestBatchTransportReader.java
index 2088330d0235efd77c37054f48974d57ef778dce..9dbd2f4a6d1fb37af2b94fe20c5ae8245a1ff4ca 100644
--- a/test/net/sf/briar/transport/batch/ByteArrayBatchTransportReader.java
+++ b/test/net/sf/briar/transport/batch/TestBatchTransportReader.java
@@ -1,16 +1,15 @@
 package net.sf.briar.transport.batch;
 
-import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 import net.sf.briar.api.transport.batch.BatchTransportReader;
 
-class ByteArrayBatchTransportReader extends FilterInputStream
+class TestBatchTransportReader extends FilterInputStream
 implements BatchTransportReader {
 
-	ByteArrayBatchTransportReader(ByteArrayInputStream in) {
+	TestBatchTransportReader(InputStream in) {
 		super(in);
 	}
 
diff --git a/test/net/sf/briar/transport/batch/ByteArrayBatchTransportWriter.java b/test/net/sf/briar/transport/batch/TestBatchTransportWriter.java
similarity index 84%
rename from test/net/sf/briar/transport/batch/ByteArrayBatchTransportWriter.java
rename to test/net/sf/briar/transport/batch/TestBatchTransportWriter.java
index 538fcb3ae34d7892aff9d0fd10592a6458ba2576..949b1331b00877694f20450061fe7b09aba63d86 100644
--- a/test/net/sf/briar/transport/batch/ByteArrayBatchTransportWriter.java
+++ b/test/net/sf/briar/transport/batch/TestBatchTransportWriter.java
@@ -1,18 +1,17 @@
 package net.sf.briar.transport.batch;
 
-import java.io.ByteArrayOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
 import net.sf.briar.api.transport.batch.BatchTransportWriter;
 
-class ByteArrayBatchTransportWriter extends FilterOutputStream
+class TestBatchTransportWriter extends FilterOutputStream
 implements BatchTransportWriter {
 
 	private int capacity;
 
-	ByteArrayBatchTransportWriter(ByteArrayOutputStream out, int capacity) {
+	TestBatchTransportWriter(OutputStream out, int capacity) {
 		super(out);
 		this.capacity = capacity;
 	}