diff --git a/conformance/setup.go b/conformance/setup.go
index 6395c4b2..ddfba950 100644
--- a/conformance/setup.go
+++ b/conformance/setup.go
@@ -309,7 +309,7 @@ func init() {
 	runPushSetup = true
 	runContentDiscoverySetup = true
 	runContentManagementSetup = true
-	skipEmptyLayerTest = false
+	skipEmptyLayerTest = true
 	deleteManifestBeforeBlobs = false
 
 	if os.Getenv(envVarTagName) != "" &&