diff --git a/crates/ra_analysis/tests/tests.rs b/crates/ra_analysis/tests/test/main.rs
similarity index 99%
rename from crates/ra_analysis/tests/tests.rs
rename to crates/ra_analysis/tests/test/main.rs
index c2ef87b549..23a5799b96 100644
--- a/crates/ra_analysis/tests/tests.rs
+++ b/crates/ra_analysis/tests/test/main.rs
@@ -1,3 +1,6 @@
+mod runnables;
+mod type_of;
+
 use ra_syntax::TextRange;
 use test_utils::{assert_eq_dbg, assert_eq_text};
 
diff --git a/crates/ra_analysis/tests/runnables.rs b/crates/ra_analysis/tests/test/runnables.rs
similarity index 92%
rename from crates/ra_analysis/tests/runnables.rs
rename to crates/ra_analysis/tests/test/runnables.rs
index 9e5342c462..e6e0afbc31 100644
--- a/crates/ra_analysis/tests/runnables.rs
+++ b/crates/ra_analysis/tests/test/runnables.rs
@@ -1,15 +1,6 @@
-extern crate ra_analysis;
-extern crate ra_editor;
-extern crate ra_syntax;
-extern crate relative_path;
-extern crate rustc_hash;
-extern crate test_utils;
-
 use test_utils::assert_eq_dbg;
 
-use ra_analysis::{
-    mock_analysis::{analysis_and_position},
-};
+use ra_analysis::mock_analysis::analysis_and_position;
 
 #[test]
 fn test_runnables() {
diff --git a/crates/ra_analysis/tests/type_of.rs b/crates/ra_analysis/tests/test/type_of.rs
similarity index 96%
rename from crates/ra_analysis/tests/type_of.rs
rename to crates/ra_analysis/tests/test/type_of.rs
index 375f808bb9..9d15b52a88 100644
--- a/crates/ra_analysis/tests/type_of.rs
+++ b/crates/ra_analysis/tests/test/type_of.rs
@@ -1,6 +1,4 @@
-use ra_analysis::{
-    mock_analysis::{single_file_with_range},
-};
+use ra_analysis::mock_analysis::single_file_with_range;
 
 #[test]
 fn test_type_of_for_function() {