diff --git a/.vscode/settings.json b/.vscode/settings.json
index f5d7a760..be0b85b7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,5 +4,11 @@
     "files.exclude": {
         "**/.build": true,
         "**/*.hex": true
+    },
+    "files.associations": {
+        "*.h": "c",
+        "*.c": "c",
+        "*.cpp": "cpp",
+        "*.hpp": "cpp"
     }
 }
\ No newline at end of file
diff --git a/tests/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp
index 2323b7cb..460c3838 100644
--- a/tests/basic/test_keypress.cpp
+++ b/tests/basic/test_keypress.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test_common.h"
+#include "test_common.hpp"
 
 using testing::_;
 using testing::Return;
diff --git a/tests/basic/test_macro.cpp b/tests/basic/test_macro.cpp
index f1990bf6..56ee5ad3 100644
--- a/tests/basic/test_macro.cpp
+++ b/tests/basic/test_macro.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test_common.h"
+#include "test_common.hpp"
 #include "time.h"
 
 using testing::InSequence;
diff --git a/tests/basic/test_tapping.cpp b/tests/basic/test_tapping.cpp
index c158e171..75a1bcaf 100644
--- a/tests/basic/test_tapping.cpp
+++ b/tests/basic/test_tapping.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test_common.h"
+#include "test_common.hpp"
 #include "action_tapping.h"
 
 using testing::_;
diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp
index aa096e41..bf728b9a 100644
--- a/tests/test_common/keyboard_report_util.cpp
+++ b/tests/test_common/keyboard_report_util.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
- #include "keyboard_report_util.h"
+ #include "keyboard_report_util.hpp"
  #include <vector>
  #include <algorithm>
  using namespace testing;
diff --git a/tests/test_common/keyboard_report_util.h b/tests/test_common/keyboard_report_util.hpp
similarity index 100%
rename from tests/test_common/keyboard_report_util.h
rename to tests/test_common/keyboard_report_util.hpp
diff --git a/tests/test_common/test_common.h b/tests/test_common/test_common.hpp
similarity index 89%
rename from tests/test_common/test_common.h
rename to tests/test_common/test_common.hpp
index 38eb0ed9..23984463 100644
--- a/tests/test_common/test_common.h
+++ b/tests/test_common/test_common.hpp
@@ -18,7 +18,7 @@
 #include "gmock/gmock.h"
 
 #include "quantum.h"
-#include "test_driver.h"
+#include "test_driver.hpp"
 #include "test_matrix.h"
-#include "keyboard_report_util.h"
-#include "test_fixture.h"
\ No newline at end of file
+#include "keyboard_report_util.hpp"
+#include "test_fixture.hpp"
\ No newline at end of file
diff --git a/tests/test_common/test_driver.cpp b/tests/test_common/test_driver.cpp
index feb80563..51130996 100644
--- a/tests/test_common/test_driver.cpp
+++ b/tests/test_common/test_driver.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test_driver.h"
+#include "test_driver.hpp"
 
 TestDriver* TestDriver::m_this = nullptr;
 
diff --git a/tests/test_common/test_driver.h b/tests/test_common/test_driver.hpp
similarity index 97%
rename from tests/test_common/test_driver.h
rename to tests/test_common/test_driver.hpp
index 0123fd53..c3ae17b1 100644
--- a/tests/test_common/test_driver.h
+++ b/tests/test_common/test_driver.hpp
@@ -20,7 +20,7 @@
 #include "gmock/gmock.h"
 #include <stdint.h>
 #include "host.h"
-#include "keyboard_report_util.h"
+#include "keyboard_report_util.hpp"
 
 
 class TestDriver {
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 5ca5247d..df57338d 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -1,6 +1,6 @@
-#include "test_fixture.h"
+#include "test_fixture.hpp"
 #include "gmock/gmock.h"
-#include "test_driver.h"
+#include "test_driver.hpp"
 #include "test_matrix.h"
 #include "keyboard.h"
 #include "action.h"
diff --git a/tests/test_common/test_fixture.h b/tests/test_common/test_fixture.hpp
similarity index 100%
rename from tests/test_common/test_fixture.h
rename to tests/test_common/test_fixture.hpp