diff --git a/test/support/test_constants.go b/test/support/test_constants.go
index 5b2ae54..d9d49c6 100644
--- a/test/support/test_constants.go
+++ b/test/support/test_constants.go
@@ -34,9 +34,7 @@ func MandatoryTasOperatorImageKeys() []string {
 
 		"ctlog-image",
 
-		"client-server-cg-image",
-		"client-server-re-image",
-		"client-server-f-image",
+		"client-server-image",
 
 		"segment-backup-job-image",
 
@@ -46,7 +44,7 @@ func MandatoryTasOperatorImageKeys() []string {
 
 func OtherOperatorImageKeys() []string {
 	return []string{
-		"client-server-image",
 		"trillian-netcat-image",
+		"http-server-image",
 	}
 }