diff --git a/briar-core/src/org/briarproject/util/ZipUtils.java b/briar-core/src/org/briarproject/util/ZipUtils.java
deleted file mode 100644
index f0b52e755..000000000
--- a/briar-core/src/org/briarproject/util/ZipUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.briarproject.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-public class ZipUtils {
-
-	/**
-	 * Copies the given file to the given zip, using the given path for the
-	 * zip entry.
-	 */
-	public static void copyToZip(String path, File file, ZipOutputStream zip)
-	throws IOException {
-		assert file.isFile();
-		zip.putNextEntry(new ZipEntry(path));
-		FileInputStream in = new FileInputStream(file);
-		byte[] buf = new byte[1024];
-		int i;
-		while((i = in.read(buf, 0, buf.length)) != -1) zip.write(buf, 0, i);
-		in.close();
-		zip.closeEntry();
-	}
-
-	/**
-	 * Copies the given directory to the given zip recursively, using the
-	 * given path in place of the directory's name as the parent of all the zip
-	 * entries. If the callback is not null it's called once for each file
-	 * added.
-	 */
-	public static void copyToZipRecursively(String path, File dir,
-			ZipOutputStream zip, Callback callback) throws IOException {
-		assert dir.isDirectory();
-		for(File child : dir.listFiles()) {
-			String childPath = extendPath(path, child.getName());
-			if(child.isDirectory()) {
-				copyToZipRecursively(childPath, child, zip, callback);
-			} else {
-				if(callback != null) callback.processingFile(child);
-				copyToZip(childPath, child, zip);
-			}
-		}
-	}
-
-	private static String extendPath(String path, String name) {
-		if(path == null || path.equals("")) return name;
-		else return path + "/" + name;
-	}
-
-	/**
-	 * Unzips the given stream to the given directory, skipping any zip entries
-	 * that don't match the given regex (a null regex matches all entries). If
-	 * the callback is not null it's called once for each file extracted.
-	 */
-	public static void unzipStream(InputStream in, File dir, String regex,
-			Callback callback) throws IOException {
-		String path = dir.getPath();
-		ZipInputStream zip = new ZipInputStream(in);
-		byte[] buf = new byte[1024];
-		ZipEntry entry;
-		while((entry = zip.getNextEntry()) != null) {
-			String name = entry.getName();
-			if(regex == null || name.matches(regex)) {
-				File file = new File(path + "/" + name);
-				if(callback != null) callback.processingFile(file);
-				if(entry.isDirectory()) {
-					file.mkdirs();
-				} else {
-					file.getParentFile().mkdirs();
-					FileOutputStream out = new FileOutputStream(file);
-					int i;
-					while((i = zip.read(buf, 0, buf.length)) > 0) {
-						out.write(buf, 0, i);
-					}
-					out.flush();
-					out.close();
-				}
-			}
-			zip.closeEntry();
-		}
-		zip.close();
-	}
-
-	public interface Callback {
-
-		void processingFile(File f);
-	}
-}
\ No newline at end of file
diff --git a/briar-tests/build.xml b/briar-tests/build.xml
index d6fb7a874..898d2c627 100644
--- a/briar-tests/build.xml
+++ b/briar-tests/build.xml
@@ -133,7 +133,6 @@
 			<test name='org.briarproject.transport.TransportConnectionRecogniserTest'/>
 			<test name='org.briarproject.util.ByteUtilsTest'/>
 			<test name='org.briarproject.util.StringUtilsTest'/>
-			<test name='org.briarproject.util.ZipUtilsTest'/>
 		</junit>
 	</target>
 	<target name='test-slow' depends='compile'>
diff --git a/briar-tests/src/org/briarproject/util/ZipUtilsTest.java b/briar-tests/src/org/briarproject/util/ZipUtilsTest.java
deleted file mode 100644
index 1e1e1d02a..000000000
--- a/briar-tests/src/org/briarproject/util/ZipUtilsTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.briarproject.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.briarproject.BriarTestCase;
-import org.briarproject.TestUtils;
-import org.briarproject.util.ZipUtils.Callback;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ZipUtilsTest extends BriarTestCase {
-
-	private final File testDir = TestUtils.getTestDirectory();
-
-	private final File f1 = new File(testDir, "abc/def/1");
-	private final File f2 = new File(testDir, "abc/def/2");
-	private final File f3 = new File(testDir, "abc/3");
-
-	@Before
-	public void setUp() {
-		testDir.mkdirs();
-	}
-
-	@Test
-	public void testCopyToZip() throws IOException {
-		File src = new File(testDir, "src");
-		File dest = new File(testDir, "dest");
-		TestUtils.createFile(src, "foo bar baz");
-		ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(dest));
-
-		ZipUtils.copyToZip("abc/def", src, zip);
-		zip.flush();
-		zip.close();
-
-		Map<String, String> expected = Collections.singletonMap("abc/def",
-				"foo bar baz");
-		checkZipEntries(dest, expected);
-	}
-
-	private void checkZipEntries(File f, Map<String, String> expected)
-	throws IOException {
-		Map<String, String> found = new HashMap<String, String>();
-		assertTrue(f.exists());
-		assertTrue(f.isFile());
-		ZipInputStream unzip = new ZipInputStream(new FileInputStream(f));
-		ZipEntry entry;
-		while((entry = unzip.getNextEntry()) != null) {
-			String name = entry.getName();
-			Scanner s = new Scanner(unzip);
-			assertTrue(s.hasNextLine());
-			String contents = s.nextLine();
-			assertFalse(s.hasNextLine());
-			unzip.closeEntry();
-			found.put(name, contents);
-		}
-		unzip.close();
-		assertEquals(expected.size(), found.size());
-		for(String name : expected.keySet()) {
-			String contents = found.get(name);
-			assertNotNull(contents);
-			assertEquals(expected.get(name), contents);
-		}
-	}
-
-	@Test
-	public void testCopyToZipRecursively() throws IOException {
-		Mockery context = new Mockery();
-		final Callback callback = context.mock(Callback.class);
-		context.checking(new Expectations() {{
-			oneOf(callback).processingFile(f1);
-			oneOf(callback).processingFile(f2);
-			oneOf(callback).processingFile(f3);
-		}});
-
-		copyRecursively(callback);
-
-		context.assertIsSatisfied();
-	}
-
-	@Test
-	public void testCopyToZipRecursivelyNoCallback() throws IOException {
-		copyRecursively(null);
-	}
-
-	private void copyRecursively(Callback callback) throws IOException {
-		TestUtils.createFile(f1, "one one one");
-		TestUtils.createFile(f2, "two two two");
-		TestUtils.createFile(f3, "three three three");
-		File src = new File(testDir, "abc");
-		File dest = new File(testDir, "dest");
-		ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(dest));
-
-		ZipUtils.copyToZipRecursively("ghi", src, zip, callback);
-		zip.flush();
-		zip.close();
-
-		Map<String, String> expected = new HashMap<String, String>();
-		expected.put("ghi/def/1", "one one one");
-		expected.put("ghi/def/2", "two two two");
-		expected.put("ghi/3", "three three three");
-		checkZipEntries(dest, expected);
-	}
-
-	@Test
-	public void testUnzipStream() throws IOException {
-		Mockery context = new Mockery();
-		final Callback callback = context.mock(Callback.class);
-		context.checking(new Expectations() {{
-			oneOf(callback).processingFile(f1);
-			oneOf(callback).processingFile(f2);
-			oneOf(callback).processingFile(f3);
-		}});
-
-		unzipStream(null, callback);
-
-		context.assertIsSatisfied();
-
-		assertTrue(f1.exists());
-		assertTrue(f1.isFile());
-		assertEquals("one one one".length(), f1.length());
-		assertTrue(f2.exists());
-		assertTrue(f2.isFile());
-		assertEquals("two two two".length(), f2.length());
-		assertTrue(f3.exists());
-		assertTrue(f3.isFile());
-		assertEquals("three three three".length(), f3.length());
-	}
-
-	@Test
-	public void testUnzipStreamWithRegex() throws IOException {
-		Mockery context = new Mockery();
-		final Callback callback = context.mock(Callback.class);
-		context.checking(new Expectations() {{
-			oneOf(callback).processingFile(f1);
-			oneOf(callback).processingFile(f2);
-		}});
-
-		unzipStream("^abc/def/.*", callback);
-
-		context.assertIsSatisfied();
-
-		assertTrue(f1.exists());
-		assertTrue(f1.isFile());
-		assertEquals("one one one".length(), f1.length());
-		assertTrue(f2.exists());
-		assertTrue(f2.isFile());
-		assertEquals("two two two".length(), f2.length());
-		assertFalse(f3.exists());
-	}
-
-	@Test
-	public void testUnzipStreamNoCallback() throws IOException {
-		unzipStream(null, null);
-
-		assertTrue(f1.exists());
-		assertTrue(f1.isFile());
-		assertEquals("one one one".length(), f1.length());
-		assertTrue(f2.exists());
-		assertTrue(f2.isFile());
-		assertEquals("two two two".length(), f2.length());
-		assertTrue(f3.exists());
-		assertTrue(f3.isFile());
-		assertEquals("three three three".length(), f3.length());
-	}
-
-	private void unzipStream(String regex, Callback callback)
-	throws IOException {
-		TestUtils.createFile(f1, "one one one");
-		TestUtils.createFile(f2, "two two two");
-		TestUtils.createFile(f3, "three three three");
-		File src = new File(testDir, "abc");
-		File dest = new File(testDir, "dest");
-		ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(dest));
-		ZipUtils.copyToZipRecursively(src.getName(), src, zip, null);
-		zip.flush();
-		zip.close();
-		TestUtils.delete(src);
-
-		InputStream in = new FileInputStream(dest);
-		ZipUtils.unzipStream(in, testDir, regex, callback);
-	}
-
-	@After
-	public void tearDown() {
-		TestUtils.deleteTestDirectory(testDir);
-	}
-}