diff --git a/test/jdk/java/awt/dnd/URLDragTest.java b/test/jdk/java/awt/dnd/URLDragTest/URLDragTest.java
similarity index 100%
rename from test/jdk/java/awt/dnd/URLDragTest.java
rename to test/jdk/java/awt/dnd/URLDragTest/URLDragTest.java
diff --git a/test/langtools/tools/javac/generics/ParametricException.java b/test/langtools/tools/javac/generics/parametricException/ParametricException.java
similarity index 100%
rename from test/langtools/tools/javac/generics/ParametricException.java
rename to test/langtools/tools/javac/generics/parametricException/ParametricException.java
diff --git a/test/langtools/tools/javac/warnings/Serial.java b/test/langtools/tools/javac/warnings/Serial/Serial.java
similarity index 100%
rename from test/langtools/tools/javac/warnings/Serial.java
rename to test/langtools/tools/javac/warnings/Serial/Serial.java
diff --git a/test/langtools/tools/javac/warnings/Serial.out b/test/langtools/tools/javac/warnings/Serial/Serial.out
similarity index 100%
rename from test/langtools/tools/javac/warnings/Serial.out
rename to test/langtools/tools/javac/warnings/Serial/Serial.out