diff --git a/test/JNI_85/Makefile b/test/JNI-85/Makefile
similarity index 100%
rename from test/JNI_85/Makefile
rename to test/JNI-85/Makefile
diff --git a/test/JNI_85/Step1.java b/test/JNI-85/Step1.java
similarity index 100%
rename from test/JNI_85/Step1.java
rename to test/JNI-85/Step1.java
diff --git a/test/JNI_85/Step2.java b/test/JNI-85/Step2.java
similarity index 100%
rename from test/JNI_85/Step2.java
rename to test/JNI-85/Step2.java
diff --git a/test/JNI_85/SyncCallbacks.java b/test/JNI-85/SyncCallbacks.java
similarity index 100%
rename from test/JNI_85/SyncCallbacks.java
rename to test/JNI-85/SyncCallbacks.java
diff --git a/test/JNI_88/JNI_88.java b/test/JNI-88/JNI-88.java
similarity index 99%
rename from test/JNI_88/JNI_88.java
rename to test/JNI-88/JNI-88.java
index 9a292a5..696f6da 100644
--- a/test/JNI_88/JNI_88.java
+++ b/test/JNI-88/JNI-88.java
@@ -93,7 +93,7 @@ class TestThread extends Thread {
     }
 }
 
-class JNI_88 {
+class JNI-88 {
     public static void main(String[] args) {
         // Test parameters
         boolean useSharedEngine = true;
diff --git a/test/JNI_88/Makefile b/test/JNI-88/Makefile
similarity index 81%
rename from test/JNI_88/Makefile
rename to test/JNI-88/Makefile
index 179ad0e..0d32fbe 100644
--- a/test/JNI_88/Makefile
+++ b/test/JNI-88/Makefile
@@ -2,7 +2,7 @@ include ../../Makefile.conf
 include ../Makefile.conf
 
 JAVA_CLASSES = \
-  JNI_88.class
+  JNI-88.class
 
 .PHONY: compile run test clean
 
@@ -10,7 +10,7 @@ all: compile
 	$(MAKE) run
 
 run: compile
-	HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) JNI_88
+	HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) JNI-88
 
 compile: $(JAVA_CLASSES)