diff --git a/common/test/Makefile b/common/test/Makefile
index 8c38dd92c..fb9c01a5c 100644
--- a/common/test/Makefile
+++ b/common/test/Makefile
@@ -1,10 +1,8 @@
-COMMON_TEST_SRC :=					\
-	common/test/test_sphinx.c
+COMMON_TEST_SRC := $(wildcard common/test/run-*.c)
 COMMON_TEST_OBJS := $(COMMON_TEST_SRC:.c=.o)
 COMMON_TEST_PROGRAMS := $(COMMON_TEST_OBJS:.o=)
 
 COMMON_TEST_COMMON_OBJS :=				\
-	common/sphinx.o					\
 	common/utils.o
 
 $(COMMON_TEST_PROGRAMS): $(COMMON_TEST_COMMON_OBJS) $(BITCOIN_OBJS)
diff --git a/common/test/test_sphinx.c b/common/test/run-sphinx.c
similarity index 99%
rename from common/test/test_sphinx.c
rename to common/test/run-sphinx.c
index e885abcc4..6917964ea 100644
--- a/common/test/test_sphinx.c
+++ b/common/test/run-sphinx.c
@@ -1,3 +1,4 @@
+#include "../sphinx.c"
 #include <secp256k1.h>
 #include <ccan/opt/opt.h>
 #include <ccan/short_types/short_types.h>