diff --git a/compiler/lib/test/codegen/CppWriter/.gitignore b/compiler/lib/test/codegen/CppWriter/.gitignore
index 7b3aa20b7..b00609714 100644
--- a/compiler/lib/test/codegen/CppWriter/.gitignore
+++ b/compiler/lib/test/codegen/CppWriter/.gitignore
@@ -3,3 +3,4 @@
 *.hpp.gch
 *.o
 build_log.txt
+hpp_log.txt
diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index a2247a786..5c1ec6fbc 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -15,11 +15,20 @@ cpp_doc_ok
 "
 
 echo 'compiling Scala source'
-if ./build > build_log.txt 2>&1
+if ! ./build > build_log.txt 2>&1
 then
-  run_suite $tests
-else
   echo 'compilation failed'
   echo 'scalac version 2.13.1 or greater required'
-  echo 'see build_log.txt for details'
+  echo 'see build_log.txt' for details
+  exit 0
 fi
+
+if ! ./hpp > hpp_log.txt 2>&1
+then
+  echo 'cannot run hpp'
+  echo 'scala version 3.4 or earlier is required'
+  echo 'see hpp_log.txt' for details
+  exit 0
+fi
+
+run_suite $tests