diff --git a/src/Makefile.ktest.include b/src/Makefile.ktest.include
deleted file mode 100644
index 18b808eef..000000000
--- a/src/Makefile.ktest.include
+++ /dev/null
@@ -1,21 +0,0 @@
-
-TESTS += komodo-test
-bin_PROGRAMS += komodo-test
-
-# tool for generating our public parameters
-komodo_test_SOURCES = \
-	test-komodo/main.cpp \
-	test-komodo/testutils.cpp \
-	test-komodo/test_cryptoconditions.cpp \
-	test-komodo/test_coinimport.cpp \
-	test-komodo/test_eval_bet.cpp \
-	test-komodo/test_eval_notarisation.cpp \
-	test-komodo/test_parse_notarisation.cpp \
-	test-komodo/test_addrman.cpp \
-	test-komodo/test_netbase_tests.cpp
-
-komodo_test_CPPFLAGS = $(komodod_CPPFLAGS)
-
-komodo_test_LDADD = -lgtest $(komodod_LDADD)
-
-komodo_test_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
diff --git a/src/Makefile.test-hush.include b/src/Makefile.test-hush.include
new file mode 100644
index 000000000..071ba557b
--- /dev/null
+++ b/src/Makefile.test-hush.include
@@ -0,0 +1,24 @@
+# Copyright (c) 2019-2020 The Hush developers
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
+
+TESTS += hush-test
+bin_PROGRAMS += hush-test
+
+# tool for generating our public parameters
+hush_test_SOURCES = \
+	test-hush/main.cpp \
+	test-hush/testutils.cpp \
+	test-hush/test_cryptoconditions.cpp \
+	test-hush/test_coinimport.cpp \
+	test-hush/test_eval_bet.cpp \
+	test-hush/test_eval_notarisation.cpp \
+	test-hush/test_parse_notarisation.cpp \
+	test-hush/test_addrman.cpp \
+	test-hush/test_netbase_tests.cpp
+
+hush_test_CPPFLAGS = $(hushd_CPPFLAGS)
+
+hush_test_LDADD = -lgtest $(hushd_LDADD)
+
+hush_test_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
diff --git a/src/test-komodo/main.cpp b/src/test-hush/main.cpp
similarity index 100%
rename from src/test-komodo/main.cpp
rename to src/test-hush/main.cpp
diff --git a/src/test-komodo/test_addrman.cpp b/src/test-hush/test_addrman.cpp
similarity index 100%
rename from src/test-komodo/test_addrman.cpp
rename to src/test-hush/test_addrman.cpp
diff --git a/src/test-komodo/test_coinimport.cpp b/src/test-hush/test_coinimport.cpp
similarity index 100%
rename from src/test-komodo/test_coinimport.cpp
rename to src/test-hush/test_coinimport.cpp
diff --git a/src/test-komodo/test_cryptoconditions.cpp b/src/test-hush/test_cryptoconditions.cpp
similarity index 100%
rename from src/test-komodo/test_cryptoconditions.cpp
rename to src/test-hush/test_cryptoconditions.cpp
diff --git a/src/test-komodo/test_eval_bet.cpp b/src/test-hush/test_eval_bet.cpp
similarity index 100%
rename from src/test-komodo/test_eval_bet.cpp
rename to src/test-hush/test_eval_bet.cpp
diff --git a/src/test-komodo/test_eval_notarisation.cpp b/src/test-hush/test_eval_notarisation.cpp
similarity index 100%
rename from src/test-komodo/test_eval_notarisation.cpp
rename to src/test-hush/test_eval_notarisation.cpp
diff --git a/src/test-komodo/test_netbase_tests.cpp b/src/test-hush/test_netbase_tests.cpp
similarity index 100%
rename from src/test-komodo/test_netbase_tests.cpp
rename to src/test-hush/test_netbase_tests.cpp
diff --git a/src/test-komodo/test_parse_notarisation.cpp b/src/test-hush/test_parse_notarisation.cpp
similarity index 100%
rename from src/test-komodo/test_parse_notarisation.cpp
rename to src/test-hush/test_parse_notarisation.cpp
diff --git a/src/test-komodo/testutils.cpp b/src/test-hush/testutils.cpp
similarity index 100%
rename from src/test-komodo/testutils.cpp
rename to src/test-hush/testutils.cpp
diff --git a/src/test-komodo/testutils.h b/src/test-hush/testutils.h
similarity index 100%
rename from src/test-komodo/testutils.h
rename to src/test-hush/testutils.h