diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 04e6839fa035a..a9e14a911c40d 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1,21 +1,17 @@
-use crate::common::Debugger;
-use crate::common::{incremental_dir, Incremental, Ui};
-use crate::common::{Config, TestPaths};
+use crate::common::{incremental_dir, Config, Debugger, Incremental, TestPaths, Ui};
 use crate::header::TestProps;
 use crate::json;
 
+use tracing::*;
+
 use std::collections::hash_map::DefaultHasher;
 use std::collections::VecDeque;
-use std::env;
 use std::fs::create_dir_all;
 use std::hash::{Hash, Hasher};
 use std::io::prelude::*;
-use std::io::{self};
 use std::path::PathBuf;
 use std::process::{Child, ExitStatus, Output};
-use std::str;
-
-use tracing::*;
+use std::{env, io, str};
 
 mod test_cx;
 mod test_cx_run_test_fns;
diff --git a/src/tools/compiletest/src/runtest/test_cx.rs b/src/tools/compiletest/src/runtest/test_cx.rs
index 9122e46e22783..0590530c9f050 100644
--- a/src/tools/compiletest/src/runtest/test_cx.rs
+++ b/src/tools/compiletest/src/runtest/test_cx.rs
@@ -1,35 +1,27 @@
 use super::*;
 
-use crate::common::{expected_output_path, UI_EXTENSIONS, UI_STDERR, UI_STDOUT};
-use crate::common::{output_base_dir, output_base_name, output_testname_unique};
-use crate::common::{Assembly, Incremental, JsDocTest, MirOpt, RunMake, RustdocJson, Ui};
-use crate::common::{Codegen, CodegenUnits, DebugInfo, Rustdoc};
-use crate::common::{CompareMode, FailMode, PassMode};
-use crate::common::{Config, TestPaths};
-use crate::common::{Pretty, RunPassValgrind};
-use crate::common::{UI_RUN_STDERR, UI_RUN_STDOUT};
+use crate::common::{
+    expected_output_path, output_base_dir, output_base_name, output_testname_unique, Assembly,
+    Codegen, CodegenUnits, CompareMode, Config, DebugInfo, FailMode, Incremental, JsDocTest,
+    MirOpt, PassMode, Pretty, RunMake, RunPassValgrind, Rustdoc, RustdocJson, TestPaths, Ui,
+    UI_EXTENSIONS, UI_RUN_STDERR, UI_RUN_STDOUT, UI_STDERR, UI_STDOUT,
+};
 use crate::errors::{self, Error, ErrorKind};
 use crate::header::TestProps;
-use crate::json;
-use crate::util::get_pointer_width;
-use crate::util::{logv, PathBufExt};
-use crate::ColorConfig;
+use crate::util::{get_pointer_width, logv, PathBufExt};
+use crate::{extract_gdb_version, is_android_gdb_target, json, ColorConfig};
+
+use glob::glob;
+use lazy_static::lazy_static;
 use regex::{Captures, Regex};
 
 use std::collections::{HashMap, HashSet};
-use std::env;
 use std::ffi::{OsStr, OsString};
 use std::fs::{self, create_dir_all, File};
 use std::io::{self, BufReader};
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output, Stdio};
-use std::str;
-
-use glob::glob;
-use lazy_static::lazy_static;
-
-use crate::extract_gdb_version;
-use crate::is_android_gdb_target;
+use std::{env, str};
 
 #[derive(Copy, Clone)]
 pub(super) struct TestCx<'test> {
diff --git a/src/tools/compiletest/src/runtest/test_cx_run_test_fns.rs b/src/tools/compiletest/src/runtest/test_cx_run_test_fns.rs
index 0a57ebafc015e..995a94dcb8e62 100644
--- a/src/tools/compiletest/src/runtest/test_cx_run_test_fns.rs
+++ b/src/tools/compiletest/src/runtest/test_cx_run_test_fns.rs
@@ -1,11 +1,9 @@
 use super::*;
 
-use crate::common::Debugger;
-use crate::common::UI_FIXED;
-use crate::common::{CompareMode, FailMode, PassMode};
-use crate::errors::{self};
-use crate::json;
+use crate::common::{CompareMode, Debugger, FailMode, PassMode, UI_FIXED};
 use crate::util::logv;
+use crate::{errors, json};
+
 use rustfix::{apply_suggestions, get_suggestions_from_json, Filter};
 
 use std::collections::HashSet;