diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4e1a630..3c381e7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,11 +23,7 @@ jobs:
           haxe-version: ${{ matrix.haxe-version }}
 
       - run: |
-          curl -sL https://github.com/massive-oss/mconsole/archive/refs/tags/1.6.1.zip -o mconsole-1.6.1.zip
-          haxelib install mconsole-1.6.1.zip
-          haxelib install hscript --quiet
-
-          haxelib install all --quiet --always --skip-dependencies
+          haxelib install all --quiet --always
           haxelib install minject 2.0.0-rc.1 && haxelib set minject 2.0.0-rc.1
 
           haxelib list
diff --git a/test-each.hxml b/test-each.hxml
index 150c2b5..861d55e 100644
--- a/test-each.hxml
+++ b/test-each.hxml
@@ -10,9 +10,6 @@
 -lib minject
 -lib tink_core
 -lib tink_macro
--lib mockatoo:git:https://github.com/DoclerLabs/mockatoo
-# this mockatoo fork depends on mconsole 1.6.1
-# available here: https://github.com/massive-oss/mconsole/releases/tag/1.6.1
 -cp src
 
 # Things need for tests
diff --git a/test-js-browser.hxml b/test-js-browser.hxml
index adc19b3..19a748f 100644
--- a/test-js-browser.hxml
+++ b/test-js-browser.hxml
@@ -1,6 +1,7 @@
 test-each.hxml
 -D client
 -lib pushstate
+-lib mockatoo:git:https://github.com/FunkinCrew/mockatoo#13d77a0a8eaf5e789ef5dae6cd33eee812deda36
 # -lib detox
 -js build/js_client_test.js
--xml doc/js_browser.xml
\ No newline at end of file
+-xml doc/js_browser.xml
diff --git a/test/ufront/api/ApiMacrosTest.hx b/test/ufront/api/ApiMacrosTest.hx
index 9975d89..50026db 100644
--- a/test/ufront/api/ApiMacrosTest.hx
+++ b/test/ufront/api/ApiMacrosTest.hx
@@ -6,9 +6,11 @@ import utest.Assert;
 import haxe.rtti.Meta;
 import haxe.EnumFlags;
 import haxe.macro.MacroType;
-import mockatoo.Mockatoo.*;
 using tink.CoreApi;
+#if client
+import mockatoo.Mockatoo.*;
 using mockatoo.Mockatoo;
+#end
 
 class ApiMacrosTest {
 	public function new() {}