diff --git a/tests/unit/test_nova_verifier.py b/tests/unit/test_nova_verifier.py
index a7a2867..649081d 100644
--- a/tests/unit/test_nova_verifier.py
+++ b/tests/unit/test_nova_verifier.py
@@ -1412,12 +1412,13 @@ class NovaVerifierValidityTestCase(StacktachBaseTestCase):
         nova_verifier._verify_validity(exist, 'all')
         self.mox.VerifyAll()
 
-    def test_should_verify_null_os_distro_if_image_type_is_import(self):
+    def test_should_verify_in_spite_of_null_os_distro_and_os_version_if_image_type_is_import(self):
         self.mox.StubOutWithMock(config, 'flavor_field_name')
         config.flavor_field_name().AndReturn('dummy_flavor_field_name')
 
         exist = self._create_mock_exist()
         exist.os_distro = ""
+        exist.os_version = ""
         exist.is_image_type_import().AndReturn(True)
         self.mox.ReplayAll()
 
diff --git a/verifier/nova_verifier.py b/verifier/nova_verifier.py
index 18187d9..814061e 100644
--- a/verifier/nova_verifier.py
+++ b/verifier/nova_verifier.py
@@ -178,10 +178,11 @@ def _verify_basic_validity(exist):
 def _verify_optional_validity(exist):
     is_image_type_import = exist.is_image_type_import()
     fields = {exist.rax_options: 'rax_options',
-              exist.os_architecture: 'os_architecture',
-              exist.os_version: 'os_version'}
+              exist.os_architecture: 'os_architecture'
+              }
     if not is_image_type_import:
-        fields.update({exist.os_distro: 'os_distro'})
+        fields.update({exist.os_distro: 'os_distro',
+                       exist.os_version: 'os_version'})
     for (field_value, field_name) in fields.items():
         if field_value == '':
             raise NullFieldException(field_name, exist.id, exist.instance)
@@ -192,8 +193,8 @@ def _verify_optional_validity(exist):
     if not is_image_type_import:
         base_verifier._is_alphanumeric(
             'os_distro', exist.os_distro, exist.id, exist.instance)
-    base_verifier._is_alphanumeric(
-        'os_version', exist.os_version, exist.id, exist.instance)
+        base_verifier._is_alphanumeric(
+            'os_version', exist.os_version, exist.id, exist.instance)
 
 
 def _verify_validity(exist, validation_level):