diff --git a/.cirrus.yml b/.cirrus.yml
index e62030ff18d..0ac33ec3c51 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -192,7 +192,7 @@ conformance_task:
     gce_instance:
         image_name: "${DEBIAN_CACHE_IMAGE_NAME}"
 
-    timeout_in: 25m
+    timeout_in: 60m
 
     matrix:
         - env:
diff --git a/Makefile b/Makefile
index 508c95c2853..2e483d7fa01 100644
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,7 @@ install.runc:
 
 .PHONY: test-conformance
 test-conformance:
-	$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -timeout 20m ./tests/conformance
+	$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -timeout 60m ./tests/conformance
 
 .PHONY: test-integration
 test-integration: install.tools