diff --git a/neon_utils/skills/common_play_skill.py b/neon_utils/skills/common_play_skill.py
index 7ddbde76..2b1c8f39 100644
--- a/neon_utils/skills/common_play_skill.py
+++ b/neon_utils/skills/common_play_skill.py
@@ -46,7 +46,7 @@
 from ovos_bus_client import Message
 from neon_utils.skills.neon_skill import NeonSkill
 
-from mycroft.skills.audioservice import AudioService
+from ovos_utils.skills.audioservice import AudioServiceInterface as AudioService
 
 
 class CPSMatchLevel(Enum):
diff --git a/neon_utils/skills/neon_skill.py b/neon_utils/skills/neon_skill.py
index cbd347cb..d9f09959 100644
--- a/neon_utils/skills/neon_skill.py
+++ b/neon_utils/skills/neon_skill.py
@@ -288,7 +288,7 @@ def voc_match(self, utt, voc_filename, lang=None, exact=False):
         voc = resolve_neon_resource_file(f"text/{lang}/{voc_filename}.voc")
         if not voc:
             raise FileNotFoundError(voc)
-        from mycroft.skills.skill_data import read_vocab_file
+        from ovos_utils.file_utils import read_vocab_file
         from itertools import chain
         import re
         vocab = read_vocab_file(voc)
diff --git a/neon_utils/validator_utils.py b/neon_utils/validator_utils.py
index c51f0d00..9adc767b 100644
--- a/neon_utils/validator_utils.py
+++ b/neon_utils/validator_utils.py
@@ -26,7 +26,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from neon_utils import LOG
 from lingua_franca import parse, set_default_lang
 
 from ovos_workshop.skills.mycroft_skill import MycroftSkill
diff --git a/requirements/test_requirements.txt b/requirements/test_requirements.txt
index 645900d4..5197c41e 100644
--- a/requirements/test_requirements.txt
+++ b/requirements/test_requirements.txt
@@ -2,7 +2,8 @@ pytest
 pytest-timeout
 pytest-cov
 mock
-ovos-core[skills,skills_lgpl]
-ovos-plugin-manager~=0.0.17
+# TODO: Deprecate ovos-core test dependency
+ovos-core~=0.0.7,>=0.0.8a21
+ovos-plugin-manager~=0.0.18
 ovos-skills-manager
 neon-lang-plugin-libretranslate
\ No newline at end of file
diff --git a/tests/skills/__init__.py b/tests/skills/__init__.py
index 0aae86cd..fcd7b9d1 100644
--- a/tests/skills/__init__.py
+++ b/tests/skills/__init__.py
@@ -32,11 +32,9 @@
     CommonQuerySkill, NeonFallbackSkill, NeonSkill, PatchedMycroftSkill,\
     InstructorSkill, KioskSkill
 
-import importlib
-import mycroft.skills
-mycroft.skills.mycroft_skill.MycroftSkill = PatchedMycroftSkill
-importlib.reload(mycroft.skills.fallback_skill)
-from mycroft.skills.fallback_skill import FallbackSkill
+import ovos_workshop.skills.ovos
+ovos_workshop.skills.ovos.MycroftSkill = PatchedMycroftSkill
+from ovos_workshop.skills.fallback import FallbackSkill
 
 
 class TestCMS(CommonMessageSkill):