diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py
index e7db6718..12a5067b 100644
--- a/src/octoprint/util/__init__.py
+++ b/src/octoprint/util/__init__.py
@@ -472,7 +472,7 @@ def dict_merge(a, b):
 	if not isinstance(b, dict):
 		return b
 	result = deepcopy(a)
-	for k, v in b.iteritems():
+	for k, v in b.items():
 		if k in result and isinstance(result[k], dict):
 			result[k] = dict_merge(result[k], v)
 		else:
@@ -508,7 +508,7 @@ def dict_sanitize(a, b):
 		return a
 
 	result = deepcopy(a)
-	for k, v in a.iteritems():
+	for k, v in a.items():
 		if not k in b:
 			del result[k]
 		elif isinstance(v, dict):
@@ -606,7 +606,7 @@ def dict_contains_keys(keys, dictionary):
 	if not isinstance(keys, dict) or not isinstance(dictionary, dict):
 		return False
 
-	for k, v in keys.iteritems():
+	for k, v in keys.items():
 		if not k in dictionary:
 			return False
 		elif isinstance(v, dict):
diff --git a/tests/test_daemon.py b/tests/test_daemon.py
index 60b1747a..61211b2c 100644
--- a/tests/test_daemon.py
+++ b/tests/test_daemon.py
@@ -96,7 +96,7 @@ class DaemonTest(unittest.TestCase):
 		self.assertEqual(self.error_method.call_count, 1)
 		mock_chdir.assert_called_once_with("/")
 		mock_setsid.assert_called_once_with()
-		mock_umask.assert_called_once_with(002)
+		mock_umask.assert_called_once_with(0o002)
 
 	@mock.patch("sys.stdin")
 	@mock.patch("sys.stdout")
diff --git a/tests/util/test_file_helpers.py b/tests/util/test_file_helpers.py
index 1400e2f6..12b5eeb5 100644
--- a/tests/util/test_file_helpers.py
+++ b/tests/util/test_file_helpers.py
@@ -181,7 +181,7 @@ class TempDirTest(unittest.TestCase):
 
 		# test
 		with octoprint.util.tempdir() as td:
-			self.assertEquals(td, path)
+			self.assertEqual(td, path)
 
 		# assert
 		mock_mkdtemp.assert_called_once_with()
@@ -198,7 +198,7 @@ class TempDirTest(unittest.TestCase):
 
 		# test
 		with octoprint.util.tempdir(prefix="prefix", suffix="suffix", dir="dir") as td:
-			self.assertEquals(td, path)
+			self.assertEqual(td, path)
 
 		# assert
 		mock_mkdtemp.assert_called_once_with(prefix="prefix", suffix="suffix", dir="dir")
@@ -217,7 +217,7 @@ class TempDirTest(unittest.TestCase):
 
 		# test
 		with octoprint.util.tempdir(ignore_errors=True, onerror=onerror) as td:
-			self.assertEquals(td, path)
+			self.assertEqual(td, path)
 
 		# assert
 		mock_mkdtemp.assert_called_once_with()