diff --git a/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp b/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp
index b930346939..7358c8d244 100644
--- a/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp
+++ b/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp
@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "MockMotorController.h"
 #include "frc/drive/DifferentialDrive.h"
 #include "gtest/gtest.h"
+#include "motorcontrol/MockMotorController.h"
 
 TEST(DifferentialDriveTest, ArcadeDriveIK) {
   // Forward
diff --git a/wpilibc/src/test/native/cpp/drive/KilloughDriveTest.cpp b/wpilibc/src/test/native/cpp/drive/KilloughDriveTest.cpp
index c23c7b0c7d..8cec8d3663 100644
--- a/wpilibc/src/test/native/cpp/drive/KilloughDriveTest.cpp
+++ b/wpilibc/src/test/native/cpp/drive/KilloughDriveTest.cpp
@@ -4,9 +4,9 @@
 
 #include <cmath>
 
-#include "MockMotorController.h"
 #include "frc/drive/KilloughDrive.h"
 #include "gtest/gtest.h"
+#include "motorcontrol/MockMotorController.h"
 
 TEST(KilloughDriveTest, CartesianIK) {
   frc::MockMotorController left;
diff --git a/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp b/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp
index 2990848129..68d4a27e21 100644
--- a/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp
+++ b/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp
@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "MockMotorController.h"
 #include "frc/drive/MecanumDrive.h"
 #include "gtest/gtest.h"
+#include "motorcontrol/MockMotorController.h"
 
 TEST(MecanumDriveTest, CartesianIK) {
   // Forward
diff --git a/wpilibc/src/test/native/cpp/MockMotorController.cpp b/wpilibc/src/test/native/cpp/motorcontrol/MockMotorController.cpp
similarity index 93%
rename from wpilibc/src/test/native/cpp/MockMotorController.cpp
rename to wpilibc/src/test/native/cpp/motorcontrol/MockMotorController.cpp
index 62fd54a31c..e0c9ee94dd 100644
--- a/wpilibc/src/test/native/cpp/MockMotorController.cpp
+++ b/wpilibc/src/test/native/cpp/motorcontrol/MockMotorController.cpp
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "MockMotorController.h"
+#include "motorcontrol/MockMotorController.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/test/native/cpp/SpeedControllerGroupTest.cpp b/wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp
similarity index 98%
rename from wpilibc/src/test/native/cpp/SpeedControllerGroupTest.cpp
rename to wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp
index 38e1592f50..6524187a9c 100644
--- a/wpilibc/src/test/native/cpp/SpeedControllerGroupTest.cpp
+++ b/wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp
@@ -7,8 +7,8 @@
 #include <memory>
 #include <vector>
 
-#include "MockMotorController.h"
 #include "gtest/gtest.h"
+#include "motorcontrol/MockMotorController.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/test/native/include/MockMotorController.h b/wpilibc/src/test/native/include/motorcontrol/MockMotorController.h
similarity index 100%
rename from wpilibc/src/test/native/include/MockMotorController.h
rename to wpilibc/src/test/native/include/motorcontrol/MockMotorController.h