diff --git a/TODO b/TODO
index 711bbb214..6bac87071 100644
--- a/TODO
+++ b/TODO
@@ -14,8 +14,6 @@ Offline list:
 -- websocket upload protocol. different write & read on same socket,
    as opposed to HTTP, to have multiple chunks in flight.
 
--- unit tests for websocket stuff. (in integration tests)
-
 -- extension to blobserver upload protocol to minimize fsyncs: maybe a
    client can say "no rush" on a bunch of data blobs first (which
    still don't get acked back over websocket until they've been
diff --git a/pkg/test/integration/camlistore_test.go b/pkg/test/integration/camlistore_test.go
index 273784045..ed1796328 100644
--- a/pkg/test/integration/camlistore_test.go
+++ b/pkg/test/integration/camlistore_test.go
@@ -20,15 +20,17 @@ import (
 	"bufio"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 
-	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/test"
+	"camlistore.org/third_party/github.com/gorilla/websocket"
 )
 
 // Test that running:
@@ -36,13 +38,9 @@ import (
 // ... creates and uploads a permanode, and that we can camget it back.
 func TestCamputPermanode(t *testing.T) {
 	w := test.GetWorld(t)
-	out := test.MustRunCmd(t, w.Cmd("camput", "permanode"))
-	br, ok := blob.Parse(strings.TrimSpace(out))
-	if !ok {
-		t.Fatalf("Expected permanode in stdout; got %q", out)
-	}
+	br := w.NewPermanode(t)
 
-	out = test.MustRunCmd(t, w.Cmd("camget", br.String()))
+	out := test.MustRunCmd(t, w.Cmd("camget", br.String()))
 	mustHave := []string{
 		`{"camliVersion": 1,`,
 		`"camliSigner": "`,
@@ -57,6 +55,57 @@ func TestCamputPermanode(t *testing.T) {
 	}
 }
 
+func TestWebsocketQuery(t *testing.T) {
+	w := test.GetWorld(t)
+	pn := w.NewPermanode(t)
+	test.MustRunCmd(t, w.Cmd("camput", "attr", pn.String(), "tag", "foo"))
+
+	check := func(err error) {
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	const bufSize = 1 << 20
+
+	c, err := net.Dial("tcp", w.Addr())
+	if err != nil {
+		t.Fatalf("Dial: %v", err)
+	}
+
+	wc, _, err := websocket.NewClient(c, &url.URL{Host: w.Addr(), Path: w.SearchHandlerPath() + "ws"}, nil, bufSize, bufSize)
+	check(err)
+
+	msg, err := wc.NextWriter(websocket.TextMessage)
+	check(err)
+
+	_, err = msg.Write([]byte(`{"tag": "foo", "query": { "expression": "tag:foo" }}`))
+	check(err)
+	check(msg.Close())
+
+	errc := make(chan error, 1)
+	go func() {
+		inType, inMsg, err := wc.ReadMessage()
+		if err != nil {
+			errc <- err
+			return
+		}
+		if strings.Contains(string(inMsg), pn.String()) {
+			errc <- nil
+			return
+		}
+		errc <- fmt.Errorf("unexpected message type=%d msg=%q", inType, inMsg)
+	}()
+	select {
+	case err := <-errc:
+		if err != nil {
+			t.Error(err)
+		}
+	case <-time.After(5 * time.Second):
+		t.Error("timeout")
+	}
+}
+
 func TestInternalHandler(t *testing.T) {
 	w := test.GetWorld(t)
 	tests := map[string]int{
diff --git a/pkg/test/world.go b/pkg/test/world.go
index ee88f6bb2..d810dff2d 100644
--- a/pkg/test/world.go
+++ b/pkg/test/world.go
@@ -76,6 +76,10 @@ func NewWorld() (*World, error) {
 	}, nil
 }
 
+func (w *World) Addr() string {
+	return w.listener.Addr().String()
+}
+
 // Start builds the Camlistore binaries and starts a server.
 func (w *World) Start() error {
 	var err error
@@ -263,3 +267,6 @@ func (w *World) ClientIdentity() string {
 func (w *World) SecretRingFile() string {
 	return filepath.Join(w.camRoot, "pkg", "jsonsign", "testdata", "test-secring.gpg")
 }
+
+// SearchHandlerPath returns the path to the search handler, with trailing slash.
+func (w *World) SearchHandlerPath() string { return "/my-search/" }