diff --git a/src/adafruit_circuitplayground/test/test_utils.py b/src/adafruit_circuitplayground/test/test_utils.py
index a3c38e1b1..21a8c6296 100644
--- a/src/adafruit_circuitplayground/test/test_utils.py
+++ b/src/adafruit_circuitplayground/test/test_utils.py
@@ -13,16 +13,20 @@ def test_remove_leading_slashes(self):
         assert expected == utils.remove_leading_slashes(original)
 
     def test_escape_notOSX(self):
+        _utils_sys = utils.sys
         if sys.platform.startswith(CONSTANTS.MAC_OS):
             utils.sys = mock.MagicMock()
             utils.sys.configure_mock(platform="win32")
         original = "a b"
         assert original == utils.escape_if_OSX(original)
+        utils.sys = _utils_sys
 
     def test_escape_isOSX(self):
+        _utils_sys = utils.sys
         if not sys.platform.startswith(CONSTANTS.MAC_OS):
             utils.sys = mock.MagicMock()
             utils.sys.configure_mock(platform="darwin")
         original = "a b"
         expected = "a%20b"
         assert expected == utils.escape_if_OSX(original)
+        utils.sys = _utils_sys
diff --git a/src/common/utils.py b/src/common/utils.py
index a468044f7..6a0e6953d 100644
--- a/src/common/utils.py
+++ b/src/common/utils.py
@@ -44,6 +44,6 @@ def remove_leading_slashes(string):
 
 
 def escape_if_OSX(file_name):
-    if sys.platform.startswith(CONSTANTS.MAC_OS):
+    if sys.platform == CONSTANTS.MAC_OS:
         file_name = file_name.replace(" ", "%20")
     return file_name
diff --git a/src/requirements.txt b/src/requirements.txt
index 6c9e509f3..c12ba6b14 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -5,4 +5,5 @@ applicationinsights==0.11.9
 python-socketio==4.3.1
 requests==2.22.0
 pywin32==227; platform_system == "Windows"
+PyObjC; platform_system == "darwin"
 uflash==1.3.0
\ No newline at end of file