diff --git a/src/Makefile.am b/src/Makefile.am
index 77a1bb782..2e056f103 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -518,10 +518,10 @@ endif
 	@test -f $(PROTOC)
 	$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)
 
-if ENABLE_TESTS
-include Makefile.test.include
-include Makefile.gtest.include
-endif
+#if ENABLE_TESTS
+#include Makefile.test.include
+#include Makefile.gtest.include
+#endif
 
 if ENABLE_QT
 include Makefile.qt.include
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index d46ef959b..3e57a8926 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -3,9 +3,9 @@ TESTS += qt/test/test_bitcoin-qt
 
 TEST_QT_MOC_CPP = qt/test/moc_uritests.cpp
 
-#if ENABLE_WALLET
+if ENABLE_WALLET
 TEST_QT_MOC_CPP += qt/test/moc_paymentservertests.cpp
-#endif
+endif
 
 TEST_QT_H = \
   qt/test/uritests.h \