diff --git a/tests/Settings/TestCuraContainerRegistry.py b/tests/Settings/TestCuraContainerRegistry.py
new file mode 100644
index 0000000000..157e6a03f9
--- /dev/null
+++ b/tests/Settings/TestCuraContainerRegistry.py
@@ -0,0 +1,49 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+import os #To find the directory with test files and find the test files.
+import pytest #This module contains unit tests.
+import unittest.mock #To mock and monkeypatch stuff.
+
+from cura.Settings.CuraContainerRegistry import CuraContainerRegistry #The class we're testing.
+from cura.Settings.ExtruderStack import ExtruderStack #Testing for returning the correct types of stacks.
+from cura.Settings.GlobalStack import GlobalStack #Testing for returning the correct types of stacks.
+from UM.Resources import Resources #Mocking some functions of this.
+import UM.Settings.ContainerRegistry #Making empty container stacks.
+import UM.Settings.ContainerStack #Setting the container registry here properly.
+
+##  Gives a fresh CuraContainerRegistry instance.
+@pytest.fixture()
+def container_registry():
+    return CuraContainerRegistry()
+
+##  Tests whether loading gives objects of the correct type.
+@pytest.mark.parametrize("filename,                  output_class", [
+                        ("ExtruderLegacy.stack.cfg", ExtruderStack),
+                        ("MachineLegacy.stack.cfg",  GlobalStack),
+                        ("Left.extruder.cfg",        ExtruderStack),
+                        ("Global.global.cfg",        GlobalStack),
+                        ("Global.stack.cfg",         GlobalStack)
+])
+def test_loadTypes(filename, output_class, container_registry):
+    #Mock some dependencies.
+    UM.Settings.ContainerStack.setContainerRegistry(container_registry)
+    Resources.getAllResourcesOfType = unittest.mock.MagicMock(return_value = [os.path.join(os.path.dirname(os.path.abspath(__file__)), "stacks", filename)]) #Return just this tested file.
+    def findContainers(id, container_type = 0):
+        if id == "empty_material":
+            return [UM.Settings.ContainerRegistry._EmptyInstanceContainer(id)]
+        else:
+            return []
+    container_registry.findContainers = findContainers
+
+    container_registry.load()
+
+    #Check whether the resulting type was correct.
+    stack_id = filename.split(".")[0]
+    for container in container_registry._containers: #Stupid ContainerRegistry class doesn't expose any way of getting at this except by prodding the privates.
+        print(container.getId(), "==", stack_id)
+        if container.getId() == stack_id: #This is the one we're testing.
+            assert type(container) == output_class
+            break
+    else:
+        assert False #Container stack with specified ID was not loaded.
diff --git a/tests/Settings/stacks/ExtruderLegacy.stack.cfg b/tests/Settings/stacks/ExtruderLegacy.stack.cfg
new file mode 100644
index 0000000000..59c4defe06
--- /dev/null
+++ b/tests/Settings/stacks/ExtruderLegacy.stack.cfg
@@ -0,0 +1,10 @@
+[general]
+version = 3
+name = Legacy Extruder Stack
+id = ExtruderLegacy
+
+[metadata]
+type = extruder
+
+[containers]
+0 = empty_material
diff --git a/tests/Settings/stacks/Global.global.cfg b/tests/Settings/stacks/Global.global.cfg
new file mode 100644
index 0000000000..ae06e1cfe3
--- /dev/null
+++ b/tests/Settings/stacks/Global.global.cfg
@@ -0,0 +1,7 @@
+[general]
+version = 3
+name = Global
+id = Global
+
+[containers]
+0 = empty_material
diff --git a/tests/Settings/stacks/Global.stack.cfg b/tests/Settings/stacks/Global.stack.cfg
new file mode 100644
index 0000000000..ae06e1cfe3
--- /dev/null
+++ b/tests/Settings/stacks/Global.stack.cfg
@@ -0,0 +1,7 @@
+[general]
+version = 3
+name = Global
+id = Global
+
+[containers]
+0 = empty_material
diff --git a/tests/Settings/stacks/Left.extruder.cfg b/tests/Settings/stacks/Left.extruder.cfg
new file mode 100644
index 0000000000..fff7afd3e8
--- /dev/null
+++ b/tests/Settings/stacks/Left.extruder.cfg
@@ -0,0 +1,7 @@
+[general]
+version = 3
+name = Left
+id = Left
+
+[containers]
+0 = empty_material
diff --git a/tests/Settings/stacks/MachineLegacy.stack.cfg b/tests/Settings/stacks/MachineLegacy.stack.cfg
new file mode 100644
index 0000000000..257aa633c5
--- /dev/null
+++ b/tests/Settings/stacks/MachineLegacy.stack.cfg
@@ -0,0 +1,10 @@
+[general]
+version = 3
+name = Legacy Global Stack
+id = MachineLegacy
+
+[metadata]
+type = machine
+
+[containers]
+0 = empty_material