diff --git a/api/test_images.py b/api/test_images.py
index 506a9e5..5fa43d0 100644
--- a/api/test_images.py
+++ b/api/test_images.py
@@ -49,8 +49,8 @@ class ImageTest(base.EC2TestCase):
         self.assertIn('Ebs', bdm)
         ebs = bdm['Ebs']
         self.assertIsNotNone(ebs.get('SnapshotId'))
+        self.assertIsNotNone(ebs.get('DeleteOnTermination'))
         if CONF.aws.run_incompatible_tests:
-            self.assertIsNotNone(ebs.get('DeleteOnTermination'))
             self.assertIsNotNone(ebs.get('Encrypted'))
             self.assertFalse(ebs.get('Encrypted'))
             self.assertIsNotNone(ebs.get('VolumeSize'))
diff --git a/api/test_instances_ebs.py b/api/test_instances_ebs.py
index 8b073fe..ed38004 100644
--- a/api/test_instances_ebs.py
+++ b/api/test_instances_ebs.py
@@ -45,7 +45,7 @@ class InstanceWithEBSTest(base.EC2TestCase):
         self.assertEqual('attached', ebs.get('Status'))
         if CONF.aws.run_incompatible_tests:
             self.assertTrue(ebs.get('AttachTime'))
-            self.assertTrue(ebs.get('DeleteOnTermination'))
+        self.assertTrue(ebs.get('DeleteOnTermination'))
 
         data = self.client.describe_volumes(VolumeIds=[volume_id])
         self.assertEqual(1, len(data['Volumes']))