diff --git a/test/jdk/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.java b/test/jdk/javax/swing/JFileChooser/FileFilterDescription.java
similarity index 100%
rename from test/jdk/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.java
rename to test/jdk/javax/swing/JFileChooser/FileFilterDescription.java
diff --git a/test/jdk/javax/swing/JFileChooser/6798062/bug6798062.java b/test/jdk/javax/swing/JFileChooser/bug6798062.java
similarity index 100%
rename from test/jdk/javax/swing/JFileChooser/6798062/bug6798062.java
rename to test/jdk/javax/swing/JFileChooser/bug6798062.java
diff --git a/test/jdk/javax/swing/JInternalFrame/6726866/bug6726866.java b/test/jdk/javax/swing/JInternalFrame/bug6726866.java
similarity index 100%
rename from test/jdk/javax/swing/JInternalFrame/6726866/bug6726866.java
rename to test/jdk/javax/swing/JInternalFrame/bug6726866.java