diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
index fe18fb04802..3fbaf545206 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
@@ -19,6 +19,8 @@ package org.apache.solr.handler.component;
 
 import java.io.File;
 
+import org.apache.lucene.util.Constants;
+
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.params.CommonParams;
@@ -32,8 +34,8 @@ public class DistributedQueryElevationComponentTest extends BaseDistributedSearc
 
   @BeforeClass
   public static void betterNotBeJ9() {
-    assumeFalse("FIXME: SOLR-5791: This test fails under J9", 
-                System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+    assumeFalse("FIXME: SOLR-5791: This test fails under IBM J9", 
+                Constants.JAVA_VENDOR.startsWith("IBM"));
   }
 
   public DistributedQueryElevationComponentTest() {
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
index 2209a341018..33e1b52dee1 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.solr.handler.component;
 
+import org.apache.lucene.util.Constants;
+
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.common.params.TermVectorParams;
 import org.junit.BeforeClass;
@@ -24,8 +26,8 @@ import org.junit.BeforeClass;
 public class TermVectorComponentDistributedTest extends BaseDistributedSearchTestCase {
   @BeforeClass
   public static void betterNotBeJ9() {
-    assumeFalse("FIXME: SOLR-5792: This test fails under J9", 
-                System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+    assumeFalse("FIXME: SOLR-5792: This test fails under IBM J9", 
+                Constants.JAVA_VENDOR.startsWith("IBM"));
   }
 
   @Override
diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
index d9f7c0d1e16..ce0d72afbdc 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
@@ -21,6 +21,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.lucene.util.Constants;
+
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -49,8 +51,8 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
 
   @BeforeClass
   public static void betterNotBeJ9() {
-    assumeFalse("FIXME: SOLR-5793: This test fails under J9", 
-                System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+    assumeFalse("FIXME: SOLR-5793: This test fails under IBM J9", 
+                Constants.JAVA_VENDOR.startsWith("IBM"));
   }