diff --git a/src/config.rs b/src/config.rs
index b28fe3d9e36..e604e5b4b2c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -79,7 +79,7 @@ create_config! {
     imports_layout: ListTactic, ListTactic::Mixed, false, "Item layout inside a import block";
     merge_imports: bool, false, false, "Merge imports";
     group_imports: GroupImportsTactic, GroupImportsTactic::Preserve, false,
-        "Reorganize import groups";
+        "Controls the strategy for how imports are grouped together";
 
     // Ordering
     reorder_imports: bool, true, true, "Reorder import and extern crate statements alphabetically";
diff --git a/tests/source/group_imports-merge_imports.rs b/tests/source/configs/group_imports/group_imports-StdExternalCrate-merge_imports.rs
similarity index 100%
rename from tests/source/group_imports-merge_imports.rs
rename to tests/source/configs/group_imports/group_imports-StdExternalCrate-merge_imports.rs
diff --git a/tests/source/group_imports-no_reorder.rs b/tests/source/configs/group_imports/group_imports-StdExternalCrate-no_reorder.rs
similarity index 100%
rename from tests/source/group_imports-no_reorder.rs
rename to tests/source/configs/group_imports/group_imports-StdExternalCrate-no_reorder.rs
diff --git a/tests/source/group_imports.rs b/tests/source/configs/group_imports/group_imports-StdExternalCrate.rs
similarity index 100%
rename from tests/source/group_imports.rs
rename to tests/source/configs/group_imports/group_imports-StdExternalCrate.rs
diff --git a/tests/target/group_imports-merge_imports.rs b/tests/target/configs/group_imports/group_imports-StdExternalCrate-merge_imports.rs
similarity index 100%
rename from tests/target/group_imports-merge_imports.rs
rename to tests/target/configs/group_imports/group_imports-StdExternalCrate-merge_imports.rs
diff --git a/tests/target/group_imports-no_reorder.rs b/tests/target/configs/group_imports/group_imports-StdExternalCrate-no_reorder.rs
similarity index 100%
rename from tests/target/group_imports-no_reorder.rs
rename to tests/target/configs/group_imports/group_imports-StdExternalCrate-no_reorder.rs
diff --git a/tests/target/group_imports.rs b/tests/target/configs/group_imports/group_imports-StdExternalCrate.rs
similarity index 100%
rename from tests/target/group_imports.rs
rename to tests/target/configs/group_imports/group_imports-StdExternalCrate.rs