--- a/hotspot/test/Makefile	Fri Dec 02 11:07:27 2016 +0100
+++ b/hotspot/test/Makefile	Mon Dec 05 17:57:43 2016 +0100
@@ -415,13 +415,8 @@
 # Set up the directory in which the jvm directories live (client/, server/, etc.)
 ifeq ($(PLATFORM),windows)
 JVMS_DIR := $(PRODUCT_HOME)/bin
-else ifeq ($(PLATFORM),bsd)
+else
 JVMS_DIR := $(PRODUCT_HOME)/lib
-else
-# The jvms live in the architecture directory (amd64, sparcv9,
-# etc.). By using a wildcard there's no need to figure out the exact
-# name of that directory.
-JVMS_DIR := $(PRODUCT_HOME)/lib/*
 endif
 
 # Use the existance of a directory as a sign that jvm variant is available