diff --git a/os_win/tests/unit/utils/io/test_namedpipe.py b/os_win/tests/unit/utils/io/test_namedpipe.py
index 73474eec..b28ca1ae 100644
--- a/os_win/tests/unit/utils/io/test_namedpipe.py
+++ b/os_win/tests/unit/utils/io/test_namedpipe.py
@@ -76,11 +76,11 @@ class NamedPipeTestCase(test_base.BaseTestCase):
         thread = namedpipe.threading.Thread
         thread.assert_has_calls(
             [mock.call(target=self._handler._read_from_pipe),
-             mock.call().setDaemon(True),
              mock.call().start(),
              mock.call(target=self._handler._write_to_pipe),
-             mock.call().setDaemon(True),
              mock.call().start()])
+        for worker in self._handler._workers:
+            self.assertIs(True, worker.daemon)
 
     @mock.patch.object(namedpipe.NamedPipeHandler, 'stop')
     @mock.patch.object(namedpipe.NamedPipeHandler, '_open_pipe')
diff --git a/os_win/utils/compute/clusterutils.py b/os_win/utils/compute/clusterutils.py
index 9fe90a5e..5c7d9de6 100644
--- a/os_win/utils/compute/clusterutils.py
+++ b/os_win/utils/compute/clusterutils.py
@@ -605,7 +605,7 @@ class _ClusterEventListener(object):
         # If eventlet monkey patching is used, this will actually be a
         # greenthread. We just don't want to enforce eventlet usage.
         worker = threading.Thread(target=self._listen)
-        worker.setDaemon(True)
+        worker.daemon = True
 
         self._running = True
         worker.start()
diff --git a/os_win/utils/io/namedpipe.py b/os_win/utils/io/namedpipe.py
index 1331c540..903b236b 100644
--- a/os_win/utils/io/namedpipe.py
+++ b/os_win/utils/io/namedpipe.py
@@ -66,7 +66,7 @@ class NamedPipeHandler(object):
 
             for job in jobs:
                 worker = threading.Thread(target=job)
-                worker.setDaemon(True)
+                worker.daemon = True
                 worker.start()
                 self._workers.append(worker)
         except Exception as err: