diff --git a/Makefile b/Makefile
index 33666e5ac..148e987dd 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ testnet:
 $(TEST_EXE): debug
 
 test: $(TEST_EXE)
-	$(TEST_EXE)
+	test x$(CROSS) = xOFF && $(TEST_EXE)
 
 android-gradle-prepare:
 	rm -f $(ANDROID_PROPS)
@@ -222,7 +222,7 @@ coverage-config: clean
 
 coverage: coverage-config
 	$(MAKE) -C $(BUILD_ROOT)
-	$(TEST_EXE) || true # continue even if tests fail
+	test x$(CROSS) = xOFF && $(TEST_EXE) || true # continue even if tests fail
 	mkdir -p "$(COVERAGE_OUTDIR)"
 ifeq ($(CLANG),OFF)
 	gcovr -r . --branches --html --html-details -o "$(COVERAGE_OUTDIR)/lokinet.html"
@@ -259,7 +259,7 @@ debian: debian-configure
 	cp $(EXE) lokinet
 
 debian-test:
-	$(TEST_EXE) || true
+	test x$(CROSS) = xOFF && $(TEST_EXE) || true
 
 install:
 	$(MAKE) -C '$(BUILD_ROOT)' install
diff --git a/lokinet-bootstrap b/lokinet-bootstrap
index ec8487a7f..a1921f5ef 100755
--- a/lokinet-bootstrap
+++ b/lokinet-bootstrap
@@ -21,7 +21,8 @@ then
 fi
 
 # use temp file to not overrwrite existing bootstrap file on fail
-tmp=mktemp
+#tmp=mktemp
+tmp=/tmp/bootstrap.tmp
 
 # MacOS does not have wget without homebrew but does have curl
 # Rick also had indicated most BSDs have curl too