diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include
index 1c9203ffa..1ebb0c0f9 100644
--- a/src/Makefile.gtest.include
+++ b/src/Makefile.gtest.include
@@ -10,7 +10,14 @@ zcash_gtest_SOURCES = \
 	gtest/test_checktransaction.cpp \
 	gtest/json_test_vectors.cpp \
 	gtest/json_test_vectors.h \
-	gtest/test_foundersreward.cpp \
+	gtest/test_foundersreward.cpp
+# These tests are order-dependent, because they
+# depend on global state (see #1539)
+if ENABLE_WALLET
+zcash_gtest_SOURCES += \
+	wallet/gtest/test_wallet_zkeys.cpp
+endif
+zcash_gtest_SOURCES += \
 	gtest/test_jsonspirit.cpp \
 	gtest/test_tautology.cpp \
 	gtest/test_equihash.cpp \
@@ -30,8 +37,7 @@ zcash_gtest_SOURCES = \
 	gtest/test_checkblock.cpp
 if ENABLE_WALLET
 zcash_gtest_SOURCES += \
-	wallet/gtest/test_wallet.cpp \
-	wallet/gtest/test_wallet_zkeys.cpp
+	wallet/gtest/test_wallet.cpp
 endif
 
 zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC