diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java
index 670de27ee..c0f4af1cb 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java
@@ -707,7 +707,7 @@ public abstract class BaseCppTest {
 		String propName = getPropertyPrefix() + "-compiler";
    		String prop = System.getProperty(propName);
    		if(prop==null || prop.length()==0)
-   			prop = locateTool("g++5");
+   			prop = locateTool("clang++");
 		File file = new File(prop);
 		if(!file.exists())
 			throw new RuntimeException("Missing system property:" + propName);