7 files changed, 10 insertions, 11 deletions
diff --git a/test/unit/content/dependencies/generateAlbumTrackList.js b/test/unit/content/dependencies/generateAlbumTrackList.js
index 80b086ca..7b3ecd33 100644
--- a/test/unit/content/dependencies/generateAlbumTrackList.js
+++ b/test/unit/content/dependencies/generateAlbumTrackList.js
@@ -1,5 +1,5 @@
 import t from 'tap';
-import {testContentFunctions} from '../../../lib/content-function.js';
+import {testContentFunctions} from '#test-lib';
 
 testContentFunctions(t, 'generateAlbumTrackList (unit)', async (t, evaluate) => {
   await evaluate.load({
diff --git a/test/unit/content/dependencies/linkArtist.js b/test/unit/content/dependencies/linkArtist.js
index 9fceb97d..e6e19d2f 100644
--- a/test/unit/content/dependencies/linkArtist.js
+++ b/test/unit/content/dependencies/linkArtist.js
@@ -1,5 +1,5 @@
 import t from 'tap';
-import {testContentFunctions} from '../../../lib/content-function.js';
+import {testContentFunctions} from '#test-lib';
 
 testContentFunctions(t, 'linkArtist (unit)', async (t, evaluate) => {
   const artistObject = {};
diff --git a/test/unit/content/dependencies/linkContribution.js b/test/unit/content/dependencies/linkContribution.js
index bed2b6d5..94908901 100644
--- a/test/unit/content/dependencies/linkContribution.js
+++ b/test/unit/content/dependencies/linkContribution.js
@@ -1,5 +1,5 @@
 import t from 'tap';
-import {testContentFunctions} from '../../../lib/content-function.js';
+import {testContentFunctions} from '#test-lib';
 
 t.test('generateContributionLinks (unit)', async t => {
   const who1 = {
diff --git a/test/unit/data/things/cacheable-object.js b/test/unit/data/things/cacheable-object.js
index d7a88ce7..2e82af08 100644
--- a/test/unit/data/things/cacheable-object.js
+++ b/test/unit/data/things/cacheable-object.js
@@ -1,6 +1,6 @@
 import t from 'tap';
 
-import CacheableObject from '../../../../src/data/things/cacheable-object.js';
+import {CacheableObject} from '#things';
 
 function newCacheableObject(PD) {
   return new (class extends CacheableObject {
diff --git a/test/unit/data/things/track.js b/test/unit/data/things/track.js
index 0dad0e62..383e3e3f 100644
--- a/test/unit/data/things/track.js
+++ b/test/unit/data/things/track.js
@@ -1,6 +1,5 @@
 import t from 'tap';
-
-import thingConstructors from '../../../../src/data/things/index.js';
+import thingConstructors from '#things';
 
 const {
   Album,
diff --git a/test/unit/data/things/validators.js b/test/unit/data/things/validators.js
index 53cba063..bb33bf86 100644
--- a/test/unit/data/things/validators.js
+++ b/test/unit/data/things/validators.js
@@ -1,5 +1,5 @@
 import t from 'tap';
-import { showAggregate } from '../../../../src/util/sugar.js';
+import {showAggregate} from '#sugar';
 
 import {
   // Basic types
@@ -31,7 +31,7 @@ import {
 
   // Compositional utilities
   oneOf,
-} from '../../../../src/data/things/validators.js';
+} from '#validators';
 
 function test(t, msg, fn) {
   t.test(msg, t => {
diff --git a/test/unit/util/html.js b/test/unit/util/html.js
index 9b30aeb3..b5956e67 100644
--- a/test/unit/util/html.js
+++ b/test/unit/util/html.js
@@ -1,9 +1,9 @@
 import t from 'tap';
 
-import * as html from '../../../src/util/html.js';
-const {Tag, Attributes, Template} = html;
+import * as html from '#html';
+import {strictlyThrows} from '#test-lib';
 
-import {strictlyThrows} from '../../lib/strict-match-error.js';
+const {Tag, Attributes, Template} = html;
 
 t.test(`html.tag`, t => {
   t.plan(14);