diff --git a/make/Main.gmk b/make/Main.gmk
index fcea44c23caea..7675fe6fcf718 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -1310,10 +1310,9 @@ endif
 ################################################################################
 
 # all-images builds all our deliverables as images.
-ifeq ($(call isTargetOs, aix), true)
 all-images: product-images test-image all-docs-images
-else
-all-images: product-images static-jdk-image test-image all-docs-images
+ifeq ($(call isTargetOs, linux macosx windows), true)
+  all-images: static-jdk-image
 endif
 
 # all-bundles packages all our deliverables as tar.gz bundles.