diff --git a/src/test/java/subsystem_tests/drive_subsystem_tests/DriveSubsystemTestBase.java b/src/test/java/subsystem_tests/drive_subsystem_tests/DriveSubsystemTestBase.java
index 553b4f7..8daf74d 100644
--- a/src/test/java/subsystem_tests/drive_subsystem_tests/DriveSubsystemTestBase.java
+++ b/src/test/java/subsystem_tests/drive_subsystem_tests/DriveSubsystemTestBase.java
@@ -26,5 +26,9 @@ public void setUp() {
   @AfterEach
   public void tearDown() {
     driveSubsystem.close();
+    commandScheduler.cancelAll();
+    commandScheduler.unregisterAllSubsystems(); // ! breaks all test tests if not done
+    commandScheduler.close();
+    HAL.shutdown();
   }
 }