diff --git a/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java b/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
index 99e42bcf236d4558c78fd26068f87ea42a580cab..0e2c9d8dfae2e9315b74c8e18a29e0a98ad9e501 100644
--- a/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
+++ b/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
@@ -55,7 +55,11 @@ public class BdfDictionaryTest extends BriarTestCase {
 		BdfDictionary d = new BdfDictionary();
 		d.put("foo", new byte[123]);
 		d.put("bar", new Bytes(new byte[123]));
-		assertArrayEquals(new byte[123], d.getRaw("foo"));
-		assertArrayEquals(new byte[123], d.getRaw("bar"));
+		byte[] foo = d.getRaw("foo");
+		assertEquals(123, foo.length);
+		assertArrayEquals(new byte[123], foo);
+		byte[] bar = d.getRaw("bar");
+		assertEquals(123, bar.length);
+		assertArrayEquals(new byte[123], bar);
 	}
 }
diff --git a/briar-tests/src/org/briarproject/data/BdfListTest.java b/briar-tests/src/org/briarproject/data/BdfListTest.java
index 4b0275faadcc1b7e99c86c9e8b94e03d2eeda509..b1954e8164aa61ff17b2543617b7d23a0f0056d5 100644
--- a/briar-tests/src/org/briarproject/data/BdfListTest.java
+++ b/briar-tests/src/org/briarproject/data/BdfListTest.java
@@ -55,7 +55,11 @@ public class BdfListTest extends BriarTestCase {
 		BdfList list = new BdfList();
 		list.add(new byte[123]);
 		list.add(new Bytes(new byte[123]));
-		assertArrayEquals(new byte[123], list.getRaw(0));
-		assertArrayEquals(new byte[123], list.getRaw(1));
+		byte[] first = list.getRaw(0);
+		assertEquals(123, first.length);
+		assertArrayEquals(new byte[123], first);
+		byte[] second = list.getRaw(1);
+		assertEquals(123, second.length);
+		assertArrayEquals(new byte[123], second);
 	}
 }