7 files changed, 8 insertions, 7 deletions
diff --git a/tests/tanya/async/tests/loop.d b/tests/tanya/async/tests/loop.d
index 60841b1..afee3bf 100644
--- a/tests/tanya/async/tests/loop.d
+++ b/tests/tanya/async/tests/loop.d
@@ -6,7 +6,7 @@ module tanya.async.tests.loop;
 import core.time;
 import tanya.async.loop;
 import tanya.async.watcher;
-import tanya.memory;
+import tanya.memory.allocator;
 
 private final class DummyWatcher : Watcher
 {
diff --git a/tests/tanya/container/tests/array.d b/tests/tanya/container/tests/array.d
index f551fb9..c8fb914 100644
--- a/tests/tanya/container/tests/array.d
+++ b/tests/tanya/container/tests/array.d
@@ -5,7 +5,7 @@ module tanya.container.tests.array;
 
 import tanya.algorithm.comparison;
 import tanya.container.array;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.test.stub;
 
 // const arrays return usable ranges
diff --git a/tests/tanya/container/tests/set.d b/tests/tanya/container/tests/set.d
index 187869f..67259d9 100644
--- a/tests/tanya/container/tests/set.d
+++ b/tests/tanya/container/tests/set.d
@@ -4,7 +4,7 @@
 module tanya.container.tests.set;
 
 import tanya.container.set;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.test.stub;
 
 // Basic insertion logic.
diff --git a/tests/tanya/math/tests/random.d b/tests/tanya/math/tests/random.d
index 85ae3d0..2fe9f91 100644
--- a/tests/tanya/math/tests/random.d
+++ b/tests/tanya/math/tests/random.d
@@ -4,7 +4,7 @@
 module tanya.math.tests.random;
 
 import tanya.math.random;
-import tanya.memory;
+import tanya.memory.allocator;
 
 static if (is(PlatformEntropySource)) @nogc @system unittest
 {
diff --git a/tests/tanya/memory/tests/lifetime.d b/tests/tanya/memory/tests/lifetime.d
index ff7020c..332b3d2 100644
--- a/tests/tanya/memory/tests/lifetime.d
+++ b/tests/tanya/memory/tests/lifetime.d
@@ -3,7 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 module tanya.memory.tests.lifetime;
 
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.test.stub;
 
 @nogc nothrow pure @safe unittest
diff --git a/tests/tanya/memory/tests/smartref.d b/tests/tanya/memory/tests/smartref.d
index ced8553..63308d8 100644
--- a/tests/tanya/memory/tests/smartref.d
+++ b/tests/tanya/memory/tests/smartref.d
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 module tanya.memory.tests.smartref;
 
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.memory.smartref;
 import tanya.meta.trait;
 import tanya.test.stub;
diff --git a/tests/tanya/tests/format.d b/tests/tanya/tests/format.d
index b4a019d..f080a67 100644
--- a/tests/tanya/tests/format.d
+++ b/tests/tanya/tests/format.d
@@ -175,7 +175,7 @@ import tanya.range;
 // Aggregate types
 @system unittest // Object.toString has no attributes.
 {
-    import tanya.memory;
+    import tanya.memory.allocator;
     import tanya.memory.smartref;
 
     interface I