diff --git a/tests/fixtures/v1/README b/tests/fixtures/v1.cluster/README
similarity index 59%
rename from tests/fixtures/v1/README
rename to tests/fixtures/v1.cluster/README
index e930eda7d..8e144444a 100644
--- a/tests/fixtures/v1/README
+++ b/tests/fixtures/v1.cluster/README
@@ -3,13 +3,13 @@ README
 The scripts in this directory should be run from the project root:
 
 $ cd $GOPATH/src/github.com/coreos/etcd
-$ tests/fixtures/v1/complete.1.sh
+$ tests/fixtures/v1/run.1.sh
 
 Scripts with numbers should be run in separate terminal windows (in order):
 
-$ tests/fixtures/v1/complete.1.sh
-$ tests/fixtures/v1/complete.2.sh
-$ tests/fixtures/v1/complete.3.sh
-$ tests/fixtures/v1/complete.4.sh
+$ tests/fixtures/v1/run.1.sh
+$ tests/fixtures/v1/run.2.sh
+$ tests/fixtures/v1/run.3.sh
+$ tests/fixtures/v1/run.4.sh
 
 The resulting server state data can be found in tmp/node*.
diff --git a/tests/fixtures/v1/node0/conf b/tests/fixtures/v1.cluster/node0/conf
similarity index 100%
rename from tests/fixtures/v1/node0/conf
rename to tests/fixtures/v1.cluster/node0/conf
diff --git a/tests/fixtures/v1/node0/info b/tests/fixtures/v1.cluster/node0/info
similarity index 100%
rename from tests/fixtures/v1/node0/info
rename to tests/fixtures/v1.cluster/node0/info
diff --git a/tests/fixtures/v1/node0/log b/tests/fixtures/v1.cluster/node0/log
similarity index 100%
rename from tests/fixtures/v1/node0/log
rename to tests/fixtures/v1.cluster/node0/log
diff --git a/tests/fixtures/v1/node2/conf b/tests/fixtures/v1.cluster/node2/conf
similarity index 100%
rename from tests/fixtures/v1/node2/conf
rename to tests/fixtures/v1.cluster/node2/conf
diff --git a/tests/fixtures/v1/node2/info b/tests/fixtures/v1.cluster/node2/info
similarity index 100%
rename from tests/fixtures/v1/node2/info
rename to tests/fixtures/v1.cluster/node2/info
diff --git a/tests/fixtures/v1/node2/log b/tests/fixtures/v1.cluster/node2/log
similarity index 100%
rename from tests/fixtures/v1/node2/log
rename to tests/fixtures/v1.cluster/node2/log
diff --git a/tests/fixtures/v1/node3/conf b/tests/fixtures/v1.cluster/node3/conf
similarity index 100%
rename from tests/fixtures/v1/node3/conf
rename to tests/fixtures/v1.cluster/node3/conf
diff --git a/tests/fixtures/v1/node3/info b/tests/fixtures/v1.cluster/node3/info
similarity index 100%
rename from tests/fixtures/v1/node3/info
rename to tests/fixtures/v1.cluster/node3/info
diff --git a/tests/fixtures/v1/node3/log b/tests/fixtures/v1.cluster/node3/log
similarity index 100%
rename from tests/fixtures/v1/node3/log
rename to tests/fixtures/v1.cluster/node3/log
diff --git a/tests/fixtures/v1/run.1.sh b/tests/fixtures/v1.cluster/run.1.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tests/fixtures/v1/run.1.sh
rename to tests/fixtures/v1.cluster/run.1.sh
diff --git a/tests/fixtures/v1/run.2.sh b/tests/fixtures/v1.cluster/run.2.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tests/fixtures/v1/run.2.sh
rename to tests/fixtures/v1.cluster/run.2.sh
diff --git a/tests/fixtures/v1/run.3.sh b/tests/fixtures/v1.cluster/run.3.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tests/fixtures/v1/run.3.sh
rename to tests/fixtures/v1.cluster/run.3.sh
diff --git a/tests/fixtures/v1/run.4.sh b/tests/fixtures/v1.cluster/run.4.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tests/fixtures/v1/run.4.sh
rename to tests/fixtures/v1.cluster/run.4.sh
diff --git a/tests/fixtures/v1.solo/README b/tests/fixtures/v1.solo/README
new file mode 100644
index 000000000..65d86d323
--- /dev/null
+++ b/tests/fixtures/v1.solo/README
@@ -0,0 +1,13 @@
+README
+
+The scripts in this directory should be run from the project root:
+
+$ cd $GOPATH/src/github.com/coreos/etcd
+$ tests/fixtures/v1.solo/run.1.sh
+
+Scripts with numbers should be run in separate terminal windows (in order):
+
+$ tests/fixtures/v1/run.1.sh
+$ tests/fixtures/v1/run.2.sh
+
+The resulting server state data can be found in tmp/node0.
diff --git a/tests/fixtures/v1.solo/node0/conf b/tests/fixtures/v1.solo/node0/conf
new file mode 100644
index 000000000..95106f8b1
--- /dev/null
+++ b/tests/fixtures/v1.solo/node0/conf
@@ -0,0 +1 @@
+{"commitIndex":1,"peers":[]}
\ No newline at end of file
diff --git a/tests/fixtures/v1.solo/node0/info b/tests/fixtures/v1.solo/node0/info
new file mode 100644
index 000000000..398c8e1e8
--- /dev/null
+++ b/tests/fixtures/v1.solo/node0/info
@@ -0,0 +1,18 @@
+{
+ "name": "node0",
+ "raftURL": "http://127.0.0.1:7001",
+ "etcdURL": "http://127.0.0.1:4001",
+ "webURL": "",
+ "raftListenHost": "127.0.0.1:7001",
+ "etcdListenHost": "127.0.0.1:4001",
+ "raftTLS": {
+  "CertFile": "",
+  "KeyFile": "",
+  "CAFile": ""
+ },
+ "etcdTLS": {
+  "CertFile": "",
+  "KeyFile": "",
+  "CAFile": ""
+ }
+}
diff --git a/tests/fixtures/v1.solo/node0/log b/tests/fixtures/v1.solo/node0/log
new file mode 100644
index 000000000..661d21d0e
Binary files /dev/null and b/tests/fixtures/v1.solo/node0/log differ
diff --git a/tests/fixtures/v1.solo/run.1.sh b/tests/fixtures/v1.solo/run.1.sh
new file mode 100755
index 000000000..ee77deaed
--- /dev/null
+++ b/tests/fixtures/v1.solo/run.1.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./build
+./etcd -d tmp/node0 -n node0
diff --git a/tests/fixtures/v1.solo/run.2.sh b/tests/fixtures/v1.solo/run.2.sh
new file mode 100755
index 000000000..96bd3e862
--- /dev/null
+++ b/tests/fixtures/v1.solo/run.2.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+curl -L http://127.0.0.1:4001/v1/keys/message -d value="Hello world"