diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 000000000..51511d1f8
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1 @@
+test-results/
diff --git a/test/Makefile b/test/Makefile
index b4a1feb85..7e6381794 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,12 +9,15 @@ T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
 all: clean $(T) aggregate
 
 clean:
+	@echo "*** $@ ***"
 	-rm -r test-results
 
 $(T):
-	@echo "*** $@ ***"; ./$@
+	@echo "*** $@ ***"
+	./$@
 
 aggregate:
+	@echo "*** $@ ***"
 	./test-aggregate-results.sh
 
 .PHONY: all clean $(T) aggregate
diff --git a/test/t0020-init.sh b/test/t0020-init.sh
new file mode 100755
index 000000000..01601420c
--- /dev/null
+++ b/test/t0020-init.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Copyright (c) 2014 Christian Couder
+# MIT Licensed; see the LICENSE file in this repository.
+#
+
+test_description="Test init command"
+
+. ./test-lib.sh
+
+test_expect_success "ipfs init succeeds" '
+	export IPFS_DIR="$(pwd)/.go-ipfs" &&
+	ipfs init
+'
+
+test_expect_success ".go-ipfs/ has been created" '
+	test -d ".go-ipfs" &&
+	test -f ".go-ipfs/config" &&
+	test -d ".go-ipfs/datastore"
+'
+
+test_expect_success "ipfs config succeeds" '
+	echo leveldb >expected &&
+	ipfs config Datastore.Type >actual &&
+	test_cmp expected actual
+'
+
+test_done
+