diff --git a/test/net/sf/briar/plugins/file/PollingRemovableDriveMonitorTest.java b/test/net/sf/briar/plugins/file/PollingRemovableDriveMonitorTest.java
index f2d7a65dfca37646d74e7a564650db76d7b749fe..cc9e4f5dda14e65cbf525ef4c132740ef9099cf9 100644
--- a/test/net/sf/briar/plugins/file/PollingRemovableDriveMonitorTest.java
+++ b/test/net/sf/briar/plugins/file/PollingRemovableDriveMonitorTest.java
@@ -50,7 +50,7 @@ public class PollingRemovableDriveMonitorTest extends BriarTestCase {
 				Executors.newCachedThreadPool(), finder, 10);
 		monitor.start(callback);
 		// Wait for the monitor to detect the files
-		assertTrue(latch.await(1, TimeUnit.SECONDS));
+		assertTrue(latch.await(5, TimeUnit.SECONDS));
 		monitor.stop();
 		// Check that both files were detected
 		assertEquals(2, detected.size());
diff --git a/test/net/sf/briar/plugins/file/UnixRemovableDriveMonitorTest.java b/test/net/sf/briar/plugins/file/UnixRemovableDriveMonitorTest.java
index d03570621f40de413c2e6dd40b86cbc3e13e5ad8..ae3393a54824d04f4f70692133e3daf5e0a197cc 100644
--- a/test/net/sf/briar/plugins/file/UnixRemovableDriveMonitorTest.java
+++ b/test/net/sf/briar/plugins/file/UnixRemovableDriveMonitorTest.java
@@ -64,7 +64,7 @@ public class UnixRemovableDriveMonitorTest extends BriarTestCase {
 		assertTrue(file1.createNewFile());
 		assertTrue(file2.createNewFile());
 		// Wait for the monitor to detect the files
-		assertTrue(latch.await(1, TimeUnit.SECONDS));
+		assertTrue(latch.await(5, TimeUnit.SECONDS));
 		monitor.stop();
 		// Check that both files were detected
 		assertEquals(2, detected.size());
diff --git a/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java b/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
index 23e6381103d574657e5f5b33a2dba58effe4faec..bf5d6f15fc758c04c1efe416b6fd8f91f428da98 100644
--- a/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
+++ b/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
@@ -34,7 +34,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
 		SimpleSocketPlugin plugin = new SimpleSocketPlugin(e, callback, 0L);
 		plugin.start();
 		// The plugin should have bound a socket and stored the port number
-		callback.latch.await(1, TimeUnit.SECONDS);
+		callback.latch.await(5, TimeUnit.SECONDS);
 		String host = callback.local.get("internal");
 		assertNotNull(host);
 		assertEquals("127.0.0.1", host);
@@ -93,7 +93,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
 		DuplexTransportConnection d = plugin.createConnection(contactId);
 		assertNotNull(d);
 		// Check that the connection was accepted
-		assertTrue(latch.await(1, TimeUnit.SECONDS));
+		assertTrue(latch.await(5, TimeUnit.SECONDS));
 		assertFalse(error.get());
 		// Clean up
 		d.dispose(false, true);
diff --git a/test/net/sf/briar/plugins/tor/TorPluginTest.java b/test/net/sf/briar/plugins/tor/TorPluginTest.java
index 28ed8a65b11e1935383e2c9a663cc3ee9b9da489..4fbce020b53069f6a0a2062165482fb3623912dd 100644
--- a/test/net/sf/briar/plugins/tor/TorPluginTest.java
+++ b/test/net/sf/briar/plugins/tor/TorPluginTest.java
@@ -30,7 +30,7 @@ public class TorPluginTest extends BriarTestCase {
 		TorPlugin serverPlugin = new TorPlugin(e, serverCallback, 0L);
 		serverPlugin.start();
 		// The plugin should create a hidden service... eventually
-		serverCallback.latch.await(300, TimeUnit.SECONDS);
+		serverCallback.latch.await(10, TimeUnit.MINUTES);
 		String onion = serverCallback.local.get("onion");
 		assertNotNull(onion);
 		assertTrue(onion.endsWith(".onion"));
@@ -69,7 +69,7 @@ public class TorPluginTest extends BriarTestCase {
 		TorPlugin plugin = new TorPlugin(e, callback, 0L);
 		plugin.start();
 		// The plugin should create a hidden service... eventually
-		callback.latch.await(300, TimeUnit.SECONDS);
+		callback.latch.await(10, TimeUnit.MINUTES);
 		String onion = callback.local.get("onion");
 		assertNotNull(onion);
 		assertTrue(onion.endsWith(".onion"));
@@ -83,7 +83,7 @@ public class TorPluginTest extends BriarTestCase {
 		plugin = new TorPlugin(e, callback, 0L);
 		plugin.start();
 		// The plugin should create a hidden service... eventually
-		callback.latch.await(300, TimeUnit.SECONDS);
+		callback.latch.await(10, TimeUnit.MINUTES);
 		// The onion URL should be the same
 		assertEquals(onion, callback.local.get("onion"));
 		// The private key should be the same