diff --git a/Makefile b/Makefile
index 6f4b4c2d7..389f97513 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Needs to have oneof support: Ubuntu vivid's is too old :(
 PROTOCC:=protoc-c
 
-PROGRAMS := open-channel open-anchor-scriptsigs leak-anchor-sigs open-commit-sig check-commit-sig check-anchor-scriptsigs get-anchor-depth create-steal-tx create-commit-spend-tx close-channel create-close-tx update-channel update-channel-accept update-channel-signature update-channel-complete create-commit-tx
+PROGRAMS := test-cli/open-channel test-cli/open-anchor-scriptsigs test-cli/leak-anchor-sigs test-cli/open-commit-sig test-cli/check-commit-sig test-cli/check-anchor-scriptsigs test-cli/get-anchor-depth test-cli/create-steal-tx test-cli/create-commit-spend-tx test-cli/close-channel test-cli/create-close-tx test-cli/update-channel test-cli/update-channel-accept test-cli/update-channel-signature test-cli/update-channel-complete test-cli/create-commit-tx
 
 BITCOIN_OBJS := bitcoin/address.o bitcoin/base58.o bitcoin/pubkey.o bitcoin/script.o bitcoin/shadouble.o bitcoin/signature.o bitcoin/tx.o
 
@@ -14,8 +14,9 @@ CCAN_OBJS := ccan-crypto-sha256.o ccan-crypto-shachain.o ccan-err.o ccan-tal.o c
 HEADERS := $(wildcard *.h)
 
 CCANDIR := ../ccan/
-CFLAGS := -g -Wall -I $(CCANDIR) #-I $(PROTO_INCLUDE_DIR)
+CFLAGS := -g -Wall -I $(CCANDIR)
 LDLIBS := -lcrypto -lprotobuf-c
+$(PROGRAMS): CFLAGS+=-I.
 
 default: $(PROGRAMS)
 
diff --git a/check-anchor-scriptsigs.c b/test-cli/check-anchor-scriptsigs.c
similarity index 100%
rename from check-anchor-scriptsigs.c
rename to test-cli/check-anchor-scriptsigs.c
diff --git a/check-commit-sig.c b/test-cli/check-commit-sig.c
similarity index 100%
rename from check-commit-sig.c
rename to test-cli/check-commit-sig.c
diff --git a/close-channel.c b/test-cli/close-channel.c
similarity index 100%
rename from close-channel.c
rename to test-cli/close-channel.c
diff --git a/create-close-tx.c b/test-cli/create-close-tx.c
similarity index 100%
rename from create-close-tx.c
rename to test-cli/create-close-tx.c
diff --git a/create-commit-spend-tx.c b/test-cli/create-commit-spend-tx.c
similarity index 100%
rename from create-commit-spend-tx.c
rename to test-cli/create-commit-spend-tx.c
diff --git a/create-commit-tx.c b/test-cli/create-commit-tx.c
similarity index 100%
rename from create-commit-tx.c
rename to test-cli/create-commit-tx.c
diff --git a/create-steal-tx.c b/test-cli/create-steal-tx.c
similarity index 100%
rename from create-steal-tx.c
rename to test-cli/create-steal-tx.c
diff --git a/get-anchor-depth.c b/test-cli/get-anchor-depth.c
similarity index 100%
rename from get-anchor-depth.c
rename to test-cli/get-anchor-depth.c
diff --git a/leak-anchor-sigs.c b/test-cli/leak-anchor-sigs.c
similarity index 100%
rename from leak-anchor-sigs.c
rename to test-cli/leak-anchor-sigs.c
diff --git a/open-anchor-scriptsigs.c b/test-cli/open-anchor-scriptsigs.c
similarity index 100%
rename from open-anchor-scriptsigs.c
rename to test-cli/open-anchor-scriptsigs.c
diff --git a/open-channel.c b/test-cli/open-channel.c
similarity index 100%
rename from open-channel.c
rename to test-cli/open-channel.c
diff --git a/open-commit-sig.c b/test-cli/open-commit-sig.c
similarity index 100%
rename from open-commit-sig.c
rename to test-cli/open-commit-sig.c
diff --git a/update-channel-accept.c b/test-cli/update-channel-accept.c
similarity index 100%
rename from update-channel-accept.c
rename to test-cli/update-channel-accept.c
diff --git a/update-channel-complete.c b/test-cli/update-channel-complete.c
similarity index 100%
rename from update-channel-complete.c
rename to test-cli/update-channel-complete.c
diff --git a/update-channel-signature.c b/test-cli/update-channel-signature.c
similarity index 100%
rename from update-channel-signature.c
rename to test-cli/update-channel-signature.c
diff --git a/update-channel.c b/test-cli/update-channel.c
similarity index 100%
rename from update-channel.c
rename to test-cli/update-channel.c