diff --git a/zun/compute/manager.py b/zun/compute/manager.py
index 3720ce860..2be3a42a3 100644
--- a/zun/compute/manager.py
+++ b/zun/compute/manager.py
@@ -56,7 +56,7 @@ class Manager(object):
     def _validate_container_state(self, container, action):
         if container.status not in VALID_STATES[action]:
             raise exception.InvalidStateException(
-                id=container.container_id,
+                id=container.uuid,
                 action=action,
                 actual_state=container.status)
 
diff --git a/zun/tests/unit/compute/test_compute_manager.py b/zun/tests/unit/compute/test_compute_manager.py
index ed44dccb3..f5e2cbb2b 100644
--- a/zun/tests/unit/compute/test_compute_manager.py
+++ b/zun/tests/unit/compute/test_compute_manager.py
@@ -45,19 +45,20 @@ class TestManager(base.TestCase):
     def test_validate_container_state(self):
         container = Container(self.context, **utils.get_test_container())
         container.status = 'Stopped'
-        self.assertRaises(exception.InvalidStateException,
-                          self.compute_manager._validate_container_state,
-                          container, 'stop')
-        self.assertRaises(exception.InvalidStateException,
-                          self.compute_manager._validate_container_state,
-                          container, 'pause')
+        with self.assertRaisesRegexp(exception.InvalidStateException,
+                                     "%s" % container.uuid):
+            self.compute_manager._validate_container_state(container, 'stop')
+        with self.assertRaisesRegexp(exception.InvalidStateException,
+                                     "%s" % container.uuid):
+            self.compute_manager._validate_container_state(container, 'pause')
         container.status = 'Running'
-        self.assertRaises(exception.InvalidStateException,
-                          self.compute_manager._validate_container_state,
-                          container, 'start')
-        self.assertRaises(exception.InvalidStateException,
-                          self.compute_manager._validate_container_state,
-                          container, 'unpause')
+        with self.assertRaisesRegexp(exception.InvalidStateException,
+                                     "%s" % container.uuid):
+            self.compute_manager._validate_container_state(container, 'start')
+        with self.assertRaisesRegexp(exception.InvalidStateException,
+                                     "%s" % container.uuid):
+            self.compute_manager._validate_container_state(container,
+                                                           'unpause')
 
     @mock.patch.object(Container, 'save')
     @mock.patch('zun.image.driver.pull_image')