diff --git a/sd/etcd/example_test.go b/sd/etcd/example_test.go
deleted file mode 100644
index 6272720..0000000
--- a/sd/etcd/example_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package etcd
-
-import (
-	"fmt"
-	"time"
-	"io"
-
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/endpoint"
-	"golang.org/x/net/context"
-)
-
-// Package sd/etcd provides a wrapper around the coroes/etcd key value store (https://github.com/coreos/etcd)
-// This example assumes the user has an instance of etcd installed and running locally on port 2379
-func Example() {
-
-	var (
-		prefix   = "/services/foosvc/" // known at compile time
-		instance = "1.2.3.4:8080"      // taken from runtime or platform, somehow
-		key      = prefix + instance
-		value    = "http://" + instance // based on our transport
-	)
-
-	client, err := NewClient(context.Background(), []string{"http://:2379"}, ClientOptions{
-		DialTimeout:             2 * time.Second,
-		DialKeepAlive:           2 * time.Second,
-		HeaderTimeoutPerRequest: 2 * time.Second,
-	})
-
-	// Instantiate new instance of *Registrar passing in test data
-	registrar := NewRegistrar(client, Service{
-		Key:   key,
-		Value: value,
-	}, log.NewNopLogger())
-	// Register new test data to etcd
-	registrar.Register()
-
-	//Retrieve entries from etcd
-	_, err = client.GetEntries(key)
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	factory := func(string) (endpoint.Endpoint, io.Closer, error) {
-		return endpoint.Nop, nil, nil
-	}
-	subscriber, _ := NewSubscriber(client, prefix, factory, log.NewNopLogger())
-
-	endpoints, err := subscriber.Endpoints()
-	if err != nil {
-		fmt.Printf("err: %v", err)
-	}
-	fmt.Println(len(endpoints)) // hopefully 1
-
-	// Deregister first instance of test data
-	registrar.Deregister()
-
-	endpoints, err = subscriber.Endpoints()
-	if err != nil {
-		fmt.Printf("err: %v", err)
-	}
-	fmt.Println(len(endpoints)) // hopefully 0
-
-	// Verify test data no longer exists in etcd
-	_, err = client.GetEntries(key)
-	if err != nil {
-		fmt.Println(err)
-	}
-}
diff --git a/sd/etcd/integration_test.go b/sd/etcd/integration_test.go
new file mode 100644
index 0000000..6cdf194
--- /dev/null
+++ b/sd/etcd/integration_test.go
@@ -0,0 +1,118 @@
+package etcd
+
+import (
+	"io"
+	"os"
+	"testing"
+	"time"
+
+	"golang.org/x/net/context"
+
+	"github.com/go-kit/kit/endpoint"
+	"github.com/go-kit/kit/log"
+)
+
+// Package sd/etcd provides a wrapper around the etcd key/value store. This
+// example assumes the user has an instance of etcd installed and running
+// locally on port 2379.
+func TestIntegration(t *testing.T) {
+	addr := os.Getenv("ETCD_ADDR")
+	if addr == "" {
+		t.Skip("ETCD_ADDR not set; skipping integration test")
+	}
+
+	var (
+		prefix   = "/services/foosvc/" // known at compile time
+		instance = "1.2.3.4:8080"      // taken from runtime or platform, somehow
+		key      = prefix + instance
+		value    = "http://" + instance // based on our transport
+	)
+
+	client, err := NewClient(context.Background(), []string{addr}, ClientOptions{
+		DialTimeout:             2 * time.Second,
+		DialKeepAlive:           2 * time.Second,
+		HeaderTimeoutPerRequest: 2 * time.Second,
+	})
+	if err != nil {
+		t.Fatalf("NewClient(%q): %v", addr, err)
+	}
+
+	// Verify test data is initially empty.
+	entries, err := client.GetEntries(key)
+	if err == nil {
+		t.Fatalf("GetEntries(%q): expected error, got none", key)
+	}
+	t.Logf("GetEntries(%q): %v (OK)", key, err)
+
+	// Instantiate a new Registrar, passing in test data.
+	registrar := NewRegistrar(client, Service{
+		Key:   key,
+		Value: value,
+	}, log.NewContext(log.NewLogfmtLogger(os.Stderr)).With("component", "registrar"))
+
+	// Register our instance.
+	registrar.Register()
+	t.Logf("Registered")
+
+	// Retrieve entries from etcd manually.
+	entries, err = client.GetEntries(key)
+	if err != nil {
+		t.Fatalf("client.GetEntries(%q): %v", key, err)
+	}
+	if want, have := 1, len(entries); want != have {
+		t.Fatalf("client.GetEntries(%q): want %d, have %d", key, want, have)
+	}
+	if want, have := value, entries[0]; want != have {
+		t.Fatalf("want %q, have %q", want, have)
+	}
+
+	subscriber, err := NewSubscriber(
+		client,
+		prefix,
+		func(string) (endpoint.Endpoint, io.Closer, error) { return endpoint.Nop, nil, nil },
+		log.NewContext(log.NewLogfmtLogger(os.Stderr)).With("component", "subscriber"),
+	)
+	if err != nil {
+		t.Fatalf("NewSubscriber: %v", err)
+	}
+	t.Logf("Constructed Subscriber OK")
+
+	if !within(time.Second, func() bool {
+		endpoints, err := subscriber.Endpoints()
+		return err == nil && len(endpoints) == 1
+	}) {
+		t.Fatalf("Subscriber didn't see Register in time")
+	}
+	t.Logf("Subscriber saw Register OK")
+
+	// Deregister first instance of test data.
+	registrar.Deregister()
+	t.Logf("Deregistered")
+
+	// Check it was deregistered.
+	if !within(time.Second, func() bool {
+		endpoints, err := subscriber.Endpoints()
+		t.Logf("Checking Deregister: len(endpoints) = %d, err = %v", len(endpoints), err)
+		return err == nil && len(endpoints) == 0
+	}) {
+		t.Fatalf("Subscriber didn't see Deregister in time")
+	}
+
+	// Verify test data no longer exists in etcd.
+	entries, err = client.GetEntries(key)
+	if err == nil {
+		t.Fatalf("GetEntries(%q): expected error, got none", key)
+	}
+	t.Logf("GetEntries(%q): %v (OK)", key, err)
+}
+
+func within(d time.Duration, f func() bool) bool {
+	deadline := time.Now().Add(d)
+	for time.Now().Before(deadline) {
+		if f() {
+			return true
+		}
+		time.Sleep(d / 10)
+	}
+	return false
+}