diff --git a/utils/src/main/java/com/cloud/utils/UriUtils.java b/utils/src/main/java/com/cloud/utils/UriUtils.java
index 3796296dea7..5b0b06e9a00 100644
--- a/utils/src/main/java/com/cloud/utils/UriUtils.java
+++ b/utils/src/main/java/com/cloud/utils/UriUtils.java
@@ -512,7 +512,7 @@ public class UriUtils {
             ImmutableMap.<String, Set<String>>builder()
                         .put("vhd", buildExtensionSet(false, "vhd"))
                         .put("vhdx", buildExtensionSet(false, "vhdx"))
-                        .put("qcow2", buildExtensionSet(true, "qcow2"))
+                        .put("qcow2", buildExtensionSet(true, "qcow2", "img"))
                         .put("ova", buildExtensionSet(true, "ova"))
                         .put("tar", buildExtensionSet(false, "tar"))
                         .put("raw", buildExtensionSet(false, "img", "raw"))
diff --git a/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java b/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
index 9b29c86d4bb..6f104f4f98e 100644
--- a/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
+++ b/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
@@ -102,7 +102,10 @@ public class UriUtilsParametrizedTest {
             final String realFormat = format;
 
             for (String extension : FORMATS) {
-                final boolean expectSuccess = format.equals(extension.replace("img", "raw"));
+                boolean expectSuccess = format.equals(extension.replace("img", "raw"));
+                if (format.equals("qcow2") && extension.equals("img")) {
+                    expectSuccess = true;
+                }
 
                 for (String commpressionFormat : COMMPRESSION_FORMATS) {
                     final String url = validBaseUri + extension + commpressionFormat;