--- a/make/Bundles.gmk	Tue Oct 24 12:07:27 2017 +0200
+++ b/make/Bundles.gmk	Tue Oct 24 15:36:56 2017 +0200
@@ -205,6 +205,8 @@
       ) \
       $(call CacheFind, $(SYMBOLS_IMAGE_DIR))
 
+  TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
+
   ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
 
   # Create special filter rules when dealing with unzipped .dSYM directories on
@@ -264,6 +266,17 @@
 
   PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE)
 
+  # The demo bundle is only created to support client tests. Ideally it should
+  # be built with the main test bundle, but since the prerequisites match
+  # better with the product build, it makes more sense to keep it there for now.
+  $(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \
+      BUNDLE_NAME := $(TEST_DEMOS_BUNDLE_NAME), \
+      FILES := $(TEST_DEMOS_BUNDLE_FILES), \
+      BASE_DIRS := $(JDK_IMAGE_DIR), \
+      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+  ))
+
+  PRODUCT_TARGETS += $(BUILD_TEST_DEMOS_BUNDLE)
 endif
 
 ################################################################################