diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
index 014162a7fa2..c4a5a43ffb8 100644
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@@ -69,6 +69,7 @@ CPPSRCS = \
   testSameValue.cpp \
   testScriptObject.cpp \
   testSetPropertyWithNativeGetterStubSetter.cpp \
+  testBug604087.cpp \
   testTrap.cpp \
   testXDR.cpp \
   $(NULL)
diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp
new file mode 100644
index 00000000000..bdfab797b3d
--- /dev/null
+++ b/js/src/jsapi-tests/testBug604087.cpp
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
+ *
+ * Tests JS_TransplantWrappers
+ */
+
+#include "tests.h"
+#include "jswrapper.h"
+
+struct OuterWrapper : JSWrapper
+{
+    OuterWrapper() : JSWrapper(0) {}
+
+    virtual bool isOuterWindow() {
+        return true;
+    }
+
+    static OuterWrapper singleton;
+};
+
+OuterWrapper
+OuterWrapper::singleton;
+
+static JSObject *
+wrap(JSContext *cx, JSObject *toWrap, JSObject *target)
+{
+    JSAutoEnterCompartment ac;
+    if (!ac.enter(cx, target))
+        return NULL;
+
+    JSObject *wrapper = toWrap;
+    if (!JS_WrapObject(cx, &wrapper))
+        return NULL;
+    return wrapper;
+}
+
+static JSObject *
+PreWrap(JSContext *cx, JSObject *scope, JSObject *obj, uintN flags)
+{
+    JS_GC(cx);
+    return obj;
+}
+
+static JSObject *
+Wrap(JSContext *cx, JSObject *obj, JSObject *proto, JSObject *parent, uintN flags)
+{
+    return JSWrapper::New(cx, obj, proto, NULL, &JSCrossCompartmentWrapper::singleton);
+}
+
+BEGIN_TEST(testBug604087)
+{
+    JSObject *outerObj = JSWrapper::New(cx, global, global->getProto(), global,
+                                        &OuterWrapper::singleton);
+    JSObject *compartment2 = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
+    JSObject *compartment3 = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
+    JSObject *compartment4 = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
+
+    JSObject *c2wrapper = wrap(cx, outerObj, compartment2);
+    CHECK(c2wrapper);
+    c2wrapper->setProxyExtra(js::Int32Value(2));
+
+    JSObject *c3wrapper = wrap(cx, outerObj, compartment3);
+    CHECK(c3wrapper);
+    c3wrapper->setProxyExtra(js::Int32Value(3));
+
+    JSObject *c4wrapper = wrap(cx, outerObj, compartment4);
+    CHECK(c4wrapper);
+    c4wrapper->setProxyExtra(js::Int32Value(4));
+    compartment4 = c4wrapper = NULL;
+
+    JSObject *next;
+    {
+        JSAutoEnterCompartment ac;
+        CHECK(ac.enter(cx, compartment2));
+        next = JSWrapper::New(cx, compartment2, compartment2->getProto(), compartment2,
+                              &OuterWrapper::singleton);
+        CHECK(next);
+    }
+
+    JS_SetWrapObjectCallbacks(JS_GetRuntime(cx), Wrap, PreWrap);
+    CHECK(JS_TransplantWrapper(cx, outerObj, next));
+    return true;
+}
+END_TEST(testBug604087)