diff --git a/briar-tests/src/org/briarproject/plugins/ImmediateExecutor.java b/briar-tests/src/org/briarproject/ImmediateExecutor.java
similarity index 81%
rename from briar-tests/src/org/briarproject/plugins/ImmediateExecutor.java
rename to briar-tests/src/org/briarproject/ImmediateExecutor.java
index bac8cf1e5df75120fb1ceb1e9eefa2b1a70e314b..ce0267885452e75a4e7fcac39e729248529c269d 100644
--- a/briar-tests/src/org/briarproject/plugins/ImmediateExecutor.java
+++ b/briar-tests/src/org/briarproject/ImmediateExecutor.java
@@ -1,4 +1,4 @@
-package org.briarproject.plugins;
+package org.briarproject;
 
 import java.util.concurrent.Executor;
 
diff --git a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
index a70d0eaff0d9eeca8ba54a5cd5252f210167e648..cd6d4c2f892fb2587d700e8f70b4f51a79094972 100644
--- a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
@@ -1,11 +1,11 @@
 package org.briarproject.plugins.file;
 
 import org.briarproject.BriarTestCase;
+import org.briarproject.ImmediateExecutor;
 import org.briarproject.TestUtils;
 import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.plugins.TransportConnectionWriter;
 import org.briarproject.api.plugins.simplex.SimplexPluginCallback;
-import org.briarproject.plugins.ImmediateExecutor;
 import org.briarproject.plugins.file.RemovableDriveMonitor.Callback;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
diff --git a/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java b/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java
index 62e9a613b769ac876e8e304b58b9b3cd71984f83..3f67fad686e816e0b5ced9ea76107be3326ddf13 100644
--- a/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java
@@ -4,6 +4,7 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 
 import org.briarproject.BriarTestCase;
+import org.briarproject.ImmediateExecutor;
 import org.briarproject.TestDatabaseModule;
 import org.briarproject.TestSystemModule;
 import org.briarproject.TestUtils;
@@ -43,7 +44,6 @@ import org.briarproject.event.EventModule;
 import org.briarproject.identity.IdentityModule;
 import org.briarproject.lifecycle.LifecycleModule;
 import org.briarproject.messaging.MessagingModule;
-import org.briarproject.plugins.ImmediateExecutor;
 import org.briarproject.transport.TransportModule;
 import org.junit.After;
 import org.junit.Before;
diff --git a/briar-tests/src/org/briarproject/sync/SimplexOutgoingSessionTest.java b/briar-tests/src/org/briarproject/sync/SimplexOutgoingSessionTest.java
index 635b2b0685934562a494303500850b0900ecd98a..a62b7add1271d904c284c2af23d5313448a9a824 100644
--- a/briar-tests/src/org/briarproject/sync/SimplexOutgoingSessionTest.java
+++ b/briar-tests/src/org/briarproject/sync/SimplexOutgoingSessionTest.java
@@ -1,6 +1,7 @@
 package org.briarproject.sync;
 
 import org.briarproject.BriarTestCase;
+import org.briarproject.ImmediateExecutor;
 import org.briarproject.TestUtils;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.contact.ContactId;
@@ -10,7 +11,6 @@ import org.briarproject.api.event.EventBus;
 import org.briarproject.api.sync.Ack;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.api.sync.PacketWriter;
-import org.briarproject.plugins.ImmediateExecutor;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;