diff --git a/deno.json b/deno.json
index bcdf28b..4632163 100644
--- a/deno.json
+++ b/deno.json
@@ -6,7 +6,8 @@
     "dev": "deno run --allow-all mod.ts",
     "compile": "deno task compile:all",
     "compile:all": "bash scripts/compile-all.sh",
-    "test": "deno test --allow-all tests/",
+    "test": "deno run --allow-all test/test.ts && deno run --allow-all test/test.logger.ts",
+    "test:watch": "deno test --allow-all --watch test/",
     "check": "deno check mod.ts",
     "fmt": "deno fmt",
     "lint": "deno lint"
diff --git a/test/test.logger.ts b/test/test.logger.ts
index 07f3d23..ec1500d 100644
--- a/test/test.logger.ts
+++ b/test/test.logger.ts
@@ -1,5 +1,5 @@
-import { tap, expect } from '@push.rocks/tapbundle';
-import { Logger } from '../ts/logger.js';
+import { tap, expect } from 'npm:@git.zone/tstest@^1.0.0/tapbundle';
+import { Logger } from '../ts/logger.ts';
 
 // Create a Logger instance for testing
 const logger = new Logger();
diff --git a/test/test.ts b/test/test.ts
index 838616d..979bea2 100644
--- a/test/test.ts
+++ b/test/test.ts
@@ -1,8 +1,8 @@
-import { tap, expect } from '@push.rocks/tapbundle';
-import { NupstSnmp } from '../ts/snmp/manager.js';
-import type { ISnmpConfig, IUpsStatus } from '../ts/snmp/types.js';
+import { tap, expect } from 'npm:@git.zone/tstest@^1.0.0/tapbundle';
+import { NupstSnmp } from '../ts/snmp/manager.ts';
+import type { ISnmpConfig, IUpsStatus } from '../ts/snmp/types.ts';
 
-import * as qenv from '@push.rocks/qenv';
+import * as qenv from 'npm:@push.rocks/qenv';
 const testQenv = new qenv.Qenv('./', '.nogit/');
 
 // Create an SNMP instance with debug enabled