diff --git a/Tests.mk b/Tests.mk
index af86715d2b..899efd42f3 100644
--- a/Tests.mk
+++ b/Tests.mk
@@ -38,21 +38,23 @@ LIBRARIES=-lmad -lmpg123 -lcurl -ldispatch -lpthread -lBlocksRuntime -lm -ljanss
 LDFLAGS=-L$(STATIC_ROOT)/lib -L$(STATIC_ROOT)/lib/x86_64-linux-gnu
 
 
-TEST_C_SOURCES=$(wildcard src/*.c \
-	shared/*.c \
-	src/scriptable/*.c \
-	shared/scriptable/*.c \
+TEST_C_SOURCES=$(wildcard \
+	external/mp4p/src/*.c \
+	external/wcwidth/*.c \
 	plugins/libparser/*.c \
-	plugins/nullout/*.c \
-	src/ConvertUTF/*.c \
-	src/metadata/*.c \
 	plugins/m3u/*.c \
-	plugins/vfs_curl/*.c \
+	plugins/mp3/*.c \
+	plugins/nullout/*.c \
 	plugins/shellexec/*.c \
-	external/mp4p/src/*.c \
-	external/wcwidth/*.c \
+	plugins/vfs_curl/*.c \
+	shared/*.c \
+	shared/scriptable/*.c \
+	src/*.c \
+	src/ConvertUTF/*.c \
 	src/md5/*.c \
-	plugins/mp3/*.c \
+	src/metadata/*.c \
+	src/scriptable/*.c \
+	src/undo/*.c\
 	Tests/*.c)
 TEST_C_SOURCES:=$(filter-out src/main.c,$(TEST_C_SOURCES))
 TEST_C_OBJS:=$(addprefix $(BUILD)/,\
diff --git a/premake5.lua b/premake5.lua
index 3b01272656..8a07ba9d1e 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -193,6 +193,7 @@ project "deadbeef"
   targetdir "bin/%{cfg.buildcfg}"
   files {
     "src/md5/*.c",
+    "src/undo/*.c",
     "src/*.c",
     "plugins/libparser/*.c",
     "external/wcwidth/wcwidth.c",