diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index aa794ccb60c4..296d791122f3 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -33,6 +33,7 @@ import functools
 import inspect
 import math
 import sys
+import threading
 import time
 import traceback
 import typing as ty
@@ -40,7 +41,6 @@ import typing as ty
 from cinderclient import exceptions as cinder_exception
 from cursive import exception as cursive_exception
 import eventlet.event
-import eventlet.semaphore
 import eventlet.timeout
 import futurist
 from keystoneauth1 import exceptions as keystone_exception
@@ -649,12 +649,12 @@ class ComputeManager(manager.Manager):
         self.send_instance_updates = (
             CONF.filter_scheduler.track_instance_changes)
         if CONF.max_concurrent_builds != 0:
-            self._build_semaphore = eventlet.semaphore.Semaphore(
+            self._build_semaphore = threading.Semaphore(
                 CONF.max_concurrent_builds)
         else:
             self._build_semaphore = compute_utils.UnlimitedSemaphore()
         if CONF.max_concurrent_snapshots > 0:
-            self._snapshot_semaphore = eventlet.semaphore.Semaphore(
+            self._snapshot_semaphore = threading.Semaphore(
                 CONF.max_concurrent_snapshots)
         else:
             self._snapshot_semaphore = compute_utils.UnlimitedSemaphore()
@@ -1628,7 +1628,7 @@ class ComputeManager(manager.Manager):
         # user has specified a limit.
         if CONF.compute.max_concurrent_disk_ops != 0:
             compute_utils.disk_ops_semaphore = \
-                eventlet.semaphore.BoundedSemaphore(
+                threading.BoundedSemaphore(
                     CONF.compute.max_concurrent_disk_ops)
 
         if CONF.compute.max_disk_devices_to_attach == 0:
diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py
index b300ee3a58c0..712b9f23496b 100644
--- a/nova/tests/unit/compute/test_compute_mgr.py
+++ b/nova/tests/unit/compute/test_compute_mgr.py
@@ -954,7 +954,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
     def test_max_concurrent_builds_semaphore_limited(self):
         self.flags(max_concurrent_builds=123)
         self.assertEqual(123,
-                         manager.ComputeManager()._build_semaphore.balance)
+                         manager.ComputeManager()._build_semaphore._value)
 
     def test_max_concurrent_builds_semaphore_unlimited(self):
         self.flags(max_concurrent_builds=0)
@@ -988,7 +988,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
     def test_max_concurrent_snapshots_semaphore_limited(self):
         self.flags(max_concurrent_snapshots=123)
         self.assertEqual(123,
-                         manager.ComputeManager()._snapshot_semaphore.balance)
+                         manager.ComputeManager()._snapshot_semaphore._value)
 
     def test_max_concurrent_snapshots_semaphore_unlimited(self):
         self.flags(max_concurrent_snapshots=0)