diff --git a/tests/panic/panic/div-by-zero-2.rs b/tests/panic/div-by-zero-2.rs
similarity index 100%
rename from tests/panic/panic/div-by-zero-2.rs
rename to tests/panic/div-by-zero-2.rs
diff --git a/tests/panic/panic/div-by-zero-2.stderr b/tests/panic/div-by-zero-2.stderr
similarity index 100%
rename from tests/panic/panic/div-by-zero-2.stderr
rename to tests/panic/div-by-zero-2.stderr
diff --git a/tests/panic/panic/overflowing-lsh-neg.rs b/tests/panic/overflowing-lsh-neg.rs
similarity index 100%
rename from tests/panic/panic/overflowing-lsh-neg.rs
rename to tests/panic/overflowing-lsh-neg.rs
diff --git a/tests/panic/panic/overflowing-lsh-neg.stderr b/tests/panic/overflowing-lsh-neg.stderr
similarity index 100%
rename from tests/panic/panic/overflowing-lsh-neg.stderr
rename to tests/panic/overflowing-lsh-neg.stderr
diff --git a/tests/panic/panic/overflowing-rsh-1.rs b/tests/panic/overflowing-rsh-1.rs
similarity index 100%
rename from tests/panic/panic/overflowing-rsh-1.rs
rename to tests/panic/overflowing-rsh-1.rs
diff --git a/tests/panic/panic/overflowing-rsh-1.stderr b/tests/panic/overflowing-rsh-1.stderr
similarity index 100%
rename from tests/panic/panic/overflowing-rsh-1.stderr
rename to tests/panic/overflowing-rsh-1.stderr
diff --git a/tests/panic/panic/overflowing-rsh-2.rs b/tests/panic/overflowing-rsh-2.rs
similarity index 100%
rename from tests/panic/panic/overflowing-rsh-2.rs
rename to tests/panic/overflowing-rsh-2.rs
diff --git a/tests/panic/panic/overflowing-rsh-2.stderr b/tests/panic/overflowing-rsh-2.stderr
similarity index 100%
rename from tests/panic/panic/overflowing-rsh-2.stderr
rename to tests/panic/overflowing-rsh-2.stderr
diff --git a/tests/panic/panic/panic1.rs b/tests/panic/panic1.rs
similarity index 100%
rename from tests/panic/panic/panic1.rs
rename to tests/panic/panic1.rs
diff --git a/tests/panic/panic/panic1.stderr b/tests/panic/panic1.stderr
similarity index 100%
rename from tests/panic/panic/panic1.stderr
rename to tests/panic/panic1.stderr
diff --git a/tests/panic/panic/panic2.rs b/tests/panic/panic2.rs
similarity index 100%
rename from tests/panic/panic/panic2.rs
rename to tests/panic/panic2.rs
diff --git a/tests/panic/panic/panic2.stderr b/tests/panic/panic2.stderr
similarity index 100%
rename from tests/panic/panic/panic2.stderr
rename to tests/panic/panic2.stderr
diff --git a/tests/panic/panic/panic3.rs b/tests/panic/panic3.rs
similarity index 100%
rename from tests/panic/panic/panic3.rs
rename to tests/panic/panic3.rs
diff --git a/tests/panic/panic/panic3.stderr b/tests/panic/panic3.stderr
similarity index 100%
rename from tests/panic/panic/panic3.stderr
rename to tests/panic/panic3.stderr
diff --git a/tests/panic/panic/panic4.rs b/tests/panic/panic4.rs
similarity index 100%
rename from tests/panic/panic/panic4.rs
rename to tests/panic/panic4.rs
diff --git a/tests/panic/panic/panic4.stderr b/tests/panic/panic4.stderr
similarity index 100%
rename from tests/panic/panic/panic4.stderr
rename to tests/panic/panic4.stderr
diff --git a/tests/panic/panic/unsupported_foreign_function.rs b/tests/panic/unsupported_foreign_function.rs
similarity index 100%
rename from tests/panic/panic/unsupported_foreign_function.rs
rename to tests/panic/unsupported_foreign_function.rs
diff --git a/tests/panic/panic/unsupported_foreign_function.stderr b/tests/panic/unsupported_foreign_function.stderr
similarity index 100%
rename from tests/panic/panic/unsupported_foreign_function.stderr
rename to tests/panic/unsupported_foreign_function.stderr
diff --git a/tests/panic/panic/unsupported_syscall.rs b/tests/panic/unsupported_syscall.rs
similarity index 100%
rename from tests/panic/panic/unsupported_syscall.rs
rename to tests/panic/unsupported_syscall.rs
diff --git a/tests/panic/panic/unsupported_syscall.stderr b/tests/panic/unsupported_syscall.stderr
similarity index 100%
rename from tests/panic/panic/unsupported_syscall.stderr
rename to tests/panic/unsupported_syscall.stderr