diff --git a/Tests.mk b/Tests.mk
index 899efd42f3..510c5de437 100644
--- a/Tests.mk
+++ b/Tests.mk
@@ -54,7 +54,7 @@ TEST_C_SOURCES=$(wildcard \
 	src/md5/*.c \
 	src/metadata/*.c \
 	src/scriptable/*.c \
-	src/undo/*.c\
+	src/undo/*.c \
 	Tests/*.c)
 TEST_C_SOURCES:=$(filter-out src/main.c,$(TEST_C_SOURCES))
 TEST_C_OBJS:=$(addprefix $(BUILD)/,\
@@ -74,7 +74,7 @@ GOOGLE_TEST_SOURCES=external/googletest/googletest/src/gtest-all.cc
 GOOGLE_TEST_OBJS:=$(addprefix $(BUILD)/,$(notdir $(patsubst %.cc,%.o,$(GOOGLE_TEST_SOURCES))))
 
 VPATH=src \
-	$(addprefix src/,scriptable ConvertUTF md5 metadata) \
+	$(addprefix src/,scriptable ConvertUTF md5 metadata undo) \
 	$(addprefix plugins/,libparser m3u mp3 nullout shellexec vfs_curl) \
 	$(addprefix external/,mp4p/src wcwidth googletest/googletest/src) \
 	shared \
diff --git a/scripts/test.sh b/scripts/test.sh
index a8050c8daa..0092805545 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -8,14 +8,14 @@ BUILD=testbuild
 
 BAKDIR=$STATIC_DEPS/bak
 mkdir -p $BAKDIR
-mv -vt $BAKDIR $STATIC_DEPS/*c++*.so*
+mv -v $STATIC_DEPS/*c++*.so* $BAKDIR/
 
 export DDB_TEST_SUITES=${@}
 mkdir -p $BUILD
 export LD_LIBRARY_PATH=$STATIC_DEPS
-make -j --file=Tests.mk
+make V=1 -j --file=Tests.mk
 code=$?
 
-mv -vt $STATIC_DEPS $BAKDIR/*c++*.so*
+mv -v $BAKDIR/*c++*.so* $STATIC_DEPS/
 
 exit $code