diff --git a/lib/encoding/base32/base32_test.ww b/lib/encoding/base32/base32_test.ww
index 18878f2a..312ad7bc 100644
--- a/lib/encoding/base32/base32_test.ww
+++ b/lib/encoding/base32/base32_test.ww
@@ -1,6 +1,6 @@
 package base32_test;
 
-import base32;
+import encoding.base32;
 
 fn putstr(s: str, into: []u8, off: i32) i32 = {
 	let i: i32 = 0;
diff --git a/lib/encoding/base64/base64_test.ww b/lib/encoding/base64/base64_test.ww
index ca8c332f..d7095e74 100644
--- a/lib/encoding/base64/base64_test.ww
+++ b/lib/encoding/base64/base64_test.ww
@@ -8,7 +8,7 @@
 
 package base64_test;
 
-import base64;
+import encoding.base64;
 import bytes;
 import errors;
 import io;
diff --git a/lib/hash/adler32/adler32_test.ww b/lib/hash/adler32/adler32_test.ww
index f4b337d2..0d7437fc 100644
--- a/lib/hash/adler32/adler32_test.ww
+++ b/lib/hash/adler32/adler32_test.ww
@@ -1,6 +1,6 @@
 package adler32_test;
 
-import adler32;
+import hash.adler32;
 
 fn putstr(s: str, into: []u8, off: i32) i32 = {
 	let i: i32 = 0;
diff --git a/lib/hash/crc16/crc16_test.ww b/lib/hash/crc16/crc16_test.ww
index c7043ed5..e76c295e 100644
--- a/lib/hash/crc16/crc16_test.ww
+++ b/lib/hash/crc16/crc16_test.ww
@@ -1,6 +1,6 @@
 package crc16_test;
 
-import crc16;
+import hash.crc16;
 
 fn putstr(s: str, into: []u8, off: i32) i32 = {
 	let i: i32 = 0;
diff --git a/lib/hash/crc32/crc32_test.ww b/lib/hash/crc32/crc32_test.ww
index 80a03d2d..fb005ee5 100644
--- a/lib/hash/crc32/crc32_test.ww
+++ b/lib/hash/crc32/crc32_test.ww
@@ -1,6 +1,6 @@
 package crc32_test;
 
-import crc32;
+import hash.crc32;
 
 fn putstr(s: str, into: []u8, off: i32) i32 = {
 	let i: i32 = 0;
diff --git a/lib/hash/crc64/crc64_test.ww b/lib/hash/crc64/crc64_test.ww
index d293ecee..7fc4bcb5 100644
--- a/lib/hash/crc64/crc64_test.ww
+++ b/lib/hash/crc64/crc64_test.ww
@@ -1,6 +1,6 @@
 package crc64_test;
 
-import crc64;
+import hash.crc64;
 
 fn putstr(s: str, into: []u8, off: i32) i32 = {
 	let i: i32 = 0;
diff --git a/lib/hash/siphash/siphash_test.ww b/lib/hash/siphash/siphash_test.ww
index 1740776b..c3f42296 100644
--- a/lib/hash/siphash/siphash_test.ww
+++ b/lib/hash/siphash/siphash_test.ww
@@ -1,6 +1,6 @@
 package siphash_test;
 
-import siphash;
+import hash.siphash;
 
 fn putstr(s: str, into: []u8, off: i32) i32 = {
 	let i: i32 = 0;
diff --git a/lib/ww/syntax/ast_test.ww b/lib/ww/syntax/ast_test.ww
index edc3f69d..7d6ba51a 100644
--- a/lib/ww/syntax/ast_test.ww
+++ b/lib/ww/syntax/ast_test.ww
@@ -7,7 +7,7 @@
 
 package syntax_test;
 
-import syntax;
+import ww.syntax;
 
 
 fn checknkname(k: nkind, want: str) void = {
diff --git a/lib/ww/syntax/sym_test.ww b/lib/ww/syntax/sym_test.ww
index 20ea5064..b247d0cf 100644
--- a/lib/ww/syntax/sym_test.ww
+++ b/lib/ww/syntax/sym_test.ww
@@ -9,7 +9,7 @@
 
 package syntax_test;
 
-import syntax;
+import ww.syntax;
 
 @test fn scope_define_lookup() void = {
 	let s: *scope = newscope(nil);
diff --git a/lib/ww/syntax/tok_test.ww b/lib/ww/syntax/tok_test.ww
index 442bdc98..41555563 100644
--- a/lib/ww/syntax/tok_test.ww
+++ b/lib/ww/syntax/tok_test.ww
@@ -19,7 +19,7 @@
 package syntax_test;
 
 import os;
-import syntax;
+import ww.syntax;
 import temp;