diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java
index 3cffa75031f69fc1c2cee13766ff6b51b7cd42ae..8e68f4f35ad601dea92a0323105c052f0eeaf606 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java
@@ -3,7 +3,6 @@ package org.briarproject.bramble.test;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionHandler;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.TorConstants;
@@ -13,6 +12,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
 import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 import java.util.logging.Logger;
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java
index e65b39b0531a80ef5419e38dac9427c2e34ec17f..49b9048ad8827f4ff96deb9af431329379f8eeeb 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java
@@ -1,10 +1,10 @@
 package org.briarproject.bramble.test;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.PluginConfig;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java
index 70123aa5edb13f5a157f63cf5756d8f5ecde4ef7..32ea3139d4706a02c0f52ab74bbff66e19aea03f 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java
@@ -1,11 +1,11 @@
 package org.briarproject.bramble.test;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
diff --git a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java
index d95a3eca0ab95ed01190dbd876a77de36ba1a6bf..5841e7cc97d9b26f0977a04b7fdd33ef700db4e2 100644
--- a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java
+++ b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java
@@ -1,6 +1,6 @@
 package org.briarproject.bramble.mailbox;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import static org.briarproject.bramble.mailbox.MailboxIntegrationTestUtils.URL_BASE;