diff --git a/ovos_core/intent_services/converse_service.py b/ovos_core/intent_services/converse_service.py
index 28d1491ce37e..915ddaa58a57 100644
--- a/ovos_core/intent_services/converse_service.py
+++ b/ovos_core/intent_services/converse_service.py
@@ -72,7 +72,6 @@ def deactivate_skill(self, skill_id, source_skill=None, message=None):
 
                 # keep message.context
                 message = message or Message("")
-                message.context["skill_id"] = self.skill_id
                 # send bus event
                 self.bus.emit(
                     message.forward("intent.service.skills.deactivated",
@@ -100,7 +99,6 @@ def activate_skill(self, skill_id, source_skill=None, message=None):
 
             # keep message.context
             message = message or Message("")
-            message.context["skill_id"] = self.skill_id
             message = message.forward("intent.service.skills.activated",
                                       {"skill_id": skill_id})
             # send bus event
diff --git a/test/unittests/skills/test_mycroft_skill.py b/test/unittests/skills/test_mycroft_skill.py
index 6581c60f824f..95165fd5e242 100644
--- a/test/unittests/skills/test_mycroft_skill.py
+++ b/test/unittests/skills/test_mycroft_skill.py
@@ -23,12 +23,13 @@
 
 from adapt.intent import IntentBuilder
 from ovos_config import Configuration
-from ovos_utils.intents.intent_service_interface import open_intent_envelope
 
 from mycroft.skills.skill_data import (load_regex_from_file, load_regex,
                                        load_vocabulary, read_vocab_file)
 from ovos_bus_client.message import Message
+from ovos_utils.intents.intent_service_interface import open_intent_envelope
 from ovos_workshop.decorators import resting_screen_handler, intent_handler
+from ovos_workshop.skills.mycroft_skill import MycroftSkill
 from ovos_workshop.skills.ovos import OVOSSkill
 from test.util import base_config
 
@@ -631,8 +632,9 @@ class _TestSkill(OVOSSkill):
     pass
 
 
-class SimpleSkill1(_TestSkill):
+class SimpleSkill1(MycroftSkill):
     """ Test skill for normal intent builder syntax """
+
     def initialize(self):
         self.handler_run = False
         i = IntentBuilder('a').require('Keyword').build()
@@ -647,6 +649,7 @@ def stop(self):
 
 class SimpleSkill2(_TestSkill):
     """ Test skill for intent builder without .build() """
+
     def initialize(self):
         i = IntentBuilder('a').require('Keyword')
         self.register_intent(i, self.handler)
@@ -660,6 +663,7 @@ def stop(self):
 
 class SimpleSkill3(_TestSkill):
     """ Test skill for invalid Intent for register_intent """
+
     def initialize(self):
         self.register_intent('string', self.handler)