diff --git a/test/sharness/t0101-iptb-name.sh b/test/sharness/t0101-iptb-name.sh
new file mode 100755
index 000000000..f5534aa29
--- /dev/null
+++ b/test/sharness/t0101-iptb-name.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# Copyright (c) 2014 Jeromy Johnson
+# MIT Licensed; see the LICENSE file in this repository.
+#
+
+test_description="Test ipfs repo operations"
+
+. lib/test-lib.sh
+
+export IPTB_ROOT="`pwd`/.iptb"
+
+num_nodes=4
+
+ipfsi() {
+	dir="$1"
+	shift
+	IPFS_PATH="$IPTB_ROOT/$dir" ipfs $@
+}
+
+test_expect_success "set up an iptb cluster" '
+	iptb init -n $num_nodes -p 0 -f --bootstrap=none
+'
+
+check_has_connection() {
+	node=$1
+	ipfsi $node swarm peers | grep ipfs > /dev/null
+}
+
+startup_cluster() {
+	bound=`expr $num_nodes - 1`
+	test_expect_success "start up nodes" '
+		iptb start
+	'
+
+	test_expect_success "connect nodes to eachother" '
+		iptb connect [1-$bound] 0
+	'
+
+	test_expect_success "nodes are connected" '
+		for i in `seq $bound`
+		do
+			if ! check_has_connection $i; then
+				echo "oh shit guys"
+				return 1
+			fi
+		done
+	'
+}
+
+startup_cluster $num_nodes
+
+test_expect_success "add an obect on one node" '
+	echo "ipns is super fun" > file &&
+	HASH_FILE=$(ipfsi 1 add -q file)
+'
+
+test_expect_success "publish that object as an ipns entry" '
+	ipfsi 1 name publish $HASH_FILE
+'
+
+test_expect_success "add an entry on another node pointing to that one" '
+	NODE1_ID=$(iptb get id 1) &&
+	ipfsi 2 name publish /ipns/$NODE1_ID
+'
+
+test_expect_success "cat that entry on a third node" '
+	NODE2_ID=$(iptb get id 2) &&
+	ipfsi 3 cat /ipns/$NODE2_ID > output
+'
+
+test_expect_success "ensure output was the same" '
+	test_cmp file output
+'
+
+test_expect_success "shut down iptb" '
+	iptb stop
+'
+
+test_done
diff --git a/test/sharness/xt0101-iptb-name.sh b/test/sharness/xt0101-iptb-name.sh
deleted file mode 100755
index 88632d0d1..000000000
--- a/test/sharness/xt0101-iptb-name.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2014 Jeromy Johnson
-# MIT Licensed; see the LICENSE file in this repository.
-#
-
-test_description="Test ipfs repo operations"
-
-. lib/test-lib.sh
-
-export IPTB_ROOT="`pwd`/.iptb"
-
-
-test_expect_success "set up an iptb cluster" '
-	IPTB_PORT=$((RANDOM % 10000 + 22000)) &&
-	iptb -n=4 "-p=$IPTB_PORT" init &&
-	iptb -wait start
-'
-
-test_expect_success "add an obect on one node" '
-	export IPFS_PATH="$IPTB_ROOT/1" &&
-	echo "ipns is super fun" > file &&
-	HASH_FILE=`ipfs add -q file`
-'
-
-test_expect_success "publish that object as an ipns entry" '
-	ipfs name publish $HASH_FILE
-'
-
-test_expect_success "add an entry on another node pointing to that one" '
-	export IPFS_PATH="$IPTB_ROOT/2" &&
-	NODE1_ID=`iptb get id 1` &&
-	ipfs name publish /ipns/$NODE1_ID
-'
-
-test_expect_success "cat that entry on a third node" '
-	export IPFS_PATH="$IPTB_ROOT/3" &&
-	NODE2_ID=`iptb get id 2` &&
-	ipfs cat /ipns/$NODE2_ID > output
-'
-
-test_expect_success "ensure output was the same" '
-	test_cmp file output
-'
-
-test_expect_success "shut down iptb" '
-	iptb stop
-'
-
-test_done