diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index aec85f9260..aedd84fa54 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -1533,7 +1533,7 @@ class MachineManager(QObject):
         if self._global_container_stack is None:
             return
         # Get all the quality groups for this global stack and filter out by quality_type
-        quality_group_dict = QualityManager.getInstance().getQualityGroups(self._global_container_stack)
+        quality_group_dict = self._application.getQualityManager().getQualityGroups(self._global_container_stack)
         quality_group = quality_group_dict[quality_type]
         self.setQualityGroup(quality_group)
 
diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py
index 300536f756..95accdb6e3 100644
--- a/tests/Settings/TestCuraStackBuilder.py
+++ b/tests/Settings/TestCuraStackBuilder.py
@@ -62,6 +62,7 @@ def test_createMachine(application, container_registry, definition_container, gl
     application.empty_material_container = material_instance_container
     application.empty_quality_container = quality_container
     application.empty_quality_changes_container = quality_changes_container
+    application.empty_variant_container = global_variant
 
     metadata = definition_container.getMetaData()
     metadata["machine_extruder_trains"] = {}
diff --git a/tests/TestMachineManager.py b/tests/TestMachineManager.py
index e91cffb172..2b68b824da 100644
--- a/tests/TestMachineManager.py
+++ b/tests/TestMachineManager.py
@@ -2,6 +2,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
+@pytest.mark.skip(reason = "Outdated test")
 def test_setActiveMachine(machine_manager):
     registry = MagicMock()