diff --git a/consul/client_test.go b/consul/client_test.go
new file mode 100644
index 0000000000..38689e53ef
--- /dev/null
+++ b/consul/client_test.go
@@ -0,0 +1,44 @@
+package consul
+
+import (
+	"fmt"
+	"os"
+	"testing"
+	"time"
+)
+
+func testClient(t *testing.T) (string, *Client) {
+	return testClientDC(t, "dc1")
+}
+
+func testClientDC(t *testing.T, dc string) (string, *Client) {
+	dir := tmpDir(t)
+	config := DefaultConfig()
+	config.Datacenter = dc
+	config.DataDir = dir
+
+	// Adjust the ports
+	p := getPort()
+	config.NodeName = fmt.Sprintf("Node %d", p)
+	config.RPCAddr = fmt.Sprintf("127.0.0.1:%d", p)
+	config.SerfLANConfig.MemberlistConfig.BindAddr = "127.0.0.1"
+	config.SerfLANConfig.MemberlistConfig.Port = getPort()
+	config.SerfLANConfig.MemberlistConfig.ProbeTimeout = 200 * time.Millisecond
+	config.SerfLANConfig.MemberlistConfig.ProbeInterval = time.Second
+	config.SerfLANConfig.MemberlistConfig.GossipInterval = 100 * time.Millisecond
+
+	client, err := NewClient(config)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	return dir, client
+}
+
+func TestClient_StartStop(t *testing.T) {
+	dir, client := testClient(t)
+	defer os.RemoveAll(dir)
+
+	if err := client.Shutdown(); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+}