diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py
index 746c035d..e5da6b05 100644
--- a/nova/tests/compute_unittest.py
+++ b/nova/tests/compute_unittest.py
@@ -18,6 +18,8 @@
 """
 Tests For Compute
 """
+
+import datetime
 import logging
 
 from twisted.internet import defer
@@ -79,6 +81,24 @@ class ComputeTestCase(test.TrialTestCase):
         logging.info("After terminating instances: %s", instances)
         self.assertEqual(len(instances), 0)
 
+    @defer.inlineCallbacks
+    def test_run_terminate_timestamps(self):
+        """Make sure it is possible to  run and terminate instance"""
+        instance_id = self._create_instance()
+        instance_ref = db.instance_get(self.context, instance_id)
+        self.assertEqual(instance_ref['launched_at'], None)
+        self.assertEqual(instance_ref['terminated_at'], None)
+        launch = datetime.datetime.now()
+        yield self.compute.run_instance(self.context, instance_id)
+        instance_ref = db.instance_get(self.context, instance_id)
+        self.assert_(instance_ref['launched_at'] > launch)
+        self.assertEqual(instance_ref['terminated_at'], None)
+        terminate = datetime.datetime.now()
+        yield self.compute.terminate_instance(self.context, instance_id)
+        instance_ref = db.instance_get({'deleted': True}, instance_id)
+        self.assert_(instance_ref['launched_at'] < terminate)
+        self.assert_(instance_ref['terminated_at'] > terminate)
+
     @defer.inlineCallbacks
     def test_reboot(self):
         """Ensure instance can be rebooted"""