diff --git a/frontends/libretro/src/lib.rs b/frontends/libretro/src/lib.rs
index c7ba8d99367e9b6d1112ea837fdb6e154a97fcc2..97e2193b6fe3aae4acdd43e20db82b39cfdd0744 100644
--- a/frontends/libretro/src/lib.rs
+++ b/frontends/libretro/src/lib.rs
@@ -2,14 +2,6 @@
 
 pub mod consts;
 
-use std::{
-    collections::HashMap,
-    ffi::CStr,
-    fmt::{self, Display, Formatter},
-    os::raw::{c_char, c_float, c_uint, c_void},
-    slice::from_raw_parts,
-};
-
 use boytacean::{
     debugln,
     gb::{AudioProvider, GameBoy},
@@ -25,6 +17,13 @@ use consts::{
     RETRO_DEVICE_ID_JOYPAD_START, RETRO_DEVICE_ID_JOYPAD_UP, RETRO_DEVICE_ID_JOYPAD_X,
     RETRO_DEVICE_ID_JOYPAD_Y, RETRO_DEVICE_JOYPAD,
 };
+use std::{
+    collections::HashMap,
+    ffi::CStr,
+    fmt::{self, Display, Formatter},
+    os::raw::{c_char, c_float, c_uint, c_void},
+    slice::from_raw_parts,
+};
 
 use crate::consts::{REGION_NTSC, RETRO_API_VERSION};
 
diff --git a/src/apu.rs b/src/apu.rs
index 5d11961279a8d78f3802bf91eabd36860ab0e892..ab739a6d7f7f9df68d210e0a6d5ca27ec12a82e1 100644
--- a/src/apu.rs
+++ b/src/apu.rs
@@ -1072,7 +1072,7 @@ impl Default for Apu {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::Apu;
 
     #[test]
     fn test_trigger_ch1() {
diff --git a/src/cpu.rs b/src/cpu.rs
index fad2c3569dd2f7d2110743b08f74c8fcce0da9cf..74bc93029d82ff678f4659a8c3a893ad15da6f6f 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -588,7 +588,7 @@ impl Default for Cpu {
 
 #[cfg(test)]
 mod tests {
-    use crate::cpu::Cpu;
+    use super::Cpu;
 
     #[test]
     fn test_cpu_clock() {
diff --git a/src/devices/stdout.rs b/src/devices/stdout.rs
index 75dbcd27af02c480b82d454b25f887e2cd0316f3..f51734d344ff876e9af2adfecb02bf73939dd6f6 100644
--- a/src/devices/stdout.rs
+++ b/src/devices/stdout.rs
@@ -1,10 +1,10 @@
-use crate::serial::SerialDevice;
-
 use std::{
     fmt::{self, Display, Formatter},
     io::{stdout, Write},
 };
 
+use crate::serial::SerialDevice;
+
 pub struct StdoutDevice {
     flush: bool,
     callback: fn(buffer: &Vec<u8>),
diff --git a/src/dma.rs b/src/dma.rs
index 9e048b5996b9390d2eeabfe220bd62936c5a44e9..a7cfb8a9f3d6a8c6131f185700e84b08aa531b50 100644
--- a/src/dma.rs
+++ b/src/dma.rs
@@ -119,7 +119,7 @@ impl Default for Dma {
 
 #[cfg(test)]
 mod tests {
-    use crate::dma::{Dma, DmaMode};
+    use super::{Dma, DmaMode};
 
     #[test]
     fn test_dma_default() {
diff --git a/src/genie.rs b/src/genie.rs
index 9f775153798b37f2aeaa9ad3be407ccc9c3afb67..9d22093323317cae36b93f6d3a06d65524ae798a 100644
--- a/src/genie.rs
+++ b/src/genie.rs
@@ -198,7 +198,7 @@ impl Display for GameGenieCode {
 
 #[cfg(test)]
 mod tests {
-    use crate::genie::GameGenieCode;
+    use super::GameGenieCode;
 
     #[test]
     fn test_from_code() {
diff --git a/src/util.rs b/src/util.rs
index 11d791b5cff195786268e832f46f0bcb9cb051cb..59770ba442c5342fe8dcbd4d1f0b5580c457bade 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -46,7 +46,9 @@ pub fn replace_ext(path: &str, new_extension: &str) -> Option<String> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::path::Path;
+
+    use super::replace_ext;
 
     #[test]
     fn test_change_extension() {