1 files changed, 10 insertions, 13 deletions

diff --git a/build_full_test.mk b/build_full_test.mk
index 4cd1ac61b..f8030cb06 100644
--- a/build_full_test.mk
+++ b/build_full_test.mk
@@ -13,24 +13,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$(TEST)_INC := \
-        tests\test_common\common_config.h
+#include $(TMK_PATH)/protocol.mk
 
-$(TEST)_SRC := \
+TEST_PATH=tests/$(TEST)
+
+$(TEST)_SRC= \
+        $(TEST_PATH)/keymap.c \
         $(TMK_COMMON_SRC) \
         $(QUANTUM_SRC) \
         $(SRC) \
-        tests/test_common/keymap.c \
         tests/test_common/matrix.c \
         tests/test_common/test_driver.cpp \
         tests/test_common/keyboard_report_util.cpp \
-        tests/test_common/test_fixture.cpp \
-        tests/test_common/test_keymap_key.cpp \
-        tests/test_common/test_logger.cpp \
-        $(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
-
-$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS)
-
-$(TEST)_CONFIG := $(TEST_PATH)/config.h
+        tests/test_common/test_fixture.cpp
+$(TEST)_SRC += $(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
 
-VPATH += $(TOP_DIR)/tests/test_common
\ No newline at end of file
+$(TEST)_DEFS=$(TMK_COMMON_DEFS) $(OPT_DEFS)
+$(TEST)_CONFIG=$(TEST_PATH)/config.h
+VPATH+=$(TOP_DIR)/tests/test_common