diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 3244be865c..602ff27bff 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -22,8 +22,8 @@ ext {
     guava: "18.0",
     groovy: "2.4.3",
     pac4j: "1.8.5",
-    rxjava: "1.0.14",
-    hystrix: "1.4.3",
+    rxjava: "1.1.2",
+    hystrix: "1.5.1",
     jackson: "2.6.2",
     dropwizardMetrics: "3.1.1",
     pegdown: "1.5.0",
diff --git a/ratpack-rx/src/main/java/ratpack/rx/RxRatpack.java b/ratpack-rx/src/main/java/ratpack/rx/RxRatpack.java
index 867f20f510..8ff6b17247 100644
--- a/ratpack-rx/src/main/java/ratpack/rx/RxRatpack.java
+++ b/ratpack-rx/src/main/java/ratpack/rx/RxRatpack.java
@@ -309,7 +309,7 @@ public static <T> Promise<List<T>> promise(Observable<T> observable) throws Unma
    *
    *   public static void main(String[] args) throws Throwable {
    *     List<String> results = ExecHarness.yieldSingle(execution ->
-   *       new AsyncService().observe("foo").x(RxRatpack::promise)
+   *       new AsyncService().observe("foo").extend(RxRatpack::promise)
    *     ).getValue();
    *
    *     assertEquals(Arrays.asList("foo"), results);
@@ -437,7 +437,7 @@ public static <T> Promise<T> promiseSingle(Observable<T> observable) throws Unma
    *
    *   public static void main(String[] args) throws Throwable {
    *     String result = ExecHarness.yieldSingle(execution ->
-   *       new AsyncService().observe("foo").x(RxRatpack::promiseSingle)
+   *       new AsyncService().observe("foo").extend(RxRatpack::promiseSingle)
    *     ).getValue();
    *
    *     assertEquals("foo", result);
@@ -456,7 +456,7 @@ public static <T> Promise<T> promiseSingle(Observable<T> observable) throws Unma
    * public class Example {
    *   public static void main(String[] args) throws Throwable {
    *     String result = ExecHarness.yieldSingle(execution ->
-   *       Observable.<String>empty().singleOrDefault("foo").x(RxRatpack::promiseSingle)
+   *       Observable.<String>empty().singleOrDefault("foo").extend(RxRatpack::promiseSingle)
    *     ).getValue();
    *     assertEquals("foo", result);
    *   }
@@ -550,7 +550,7 @@ public static <T> TransformablePublisher<T> publisher(Observable<T> observable)
    *
    *   public static void main(String[] args) throws Throwable {
    *     List<String> result = ExecHarness.yieldSingle(execution ->
-   *       new AsyncService().observe("foo").x(RxRatpack::publisher).toList()
+   *       new AsyncService().observe("foo").extend(RxRatpack::publisher).toList()
    *     ).getValue();
    *     assertEquals("foo", result.get(0));
    *   }
diff --git a/ratpack-rx/src/test/groovy/ratpack/rx/RxErrorHandlingSpec.groovy b/ratpack-rx/src/test/groovy/ratpack/rx/RxErrorHandlingSpec.groovy
index ca0355594e..4c52458182 100644
--- a/ratpack-rx/src/test/groovy/ratpack/rx/RxErrorHandlingSpec.groovy
+++ b/ratpack-rx/src/test/groovy/ratpack/rx/RxErrorHandlingSpec.groovy
@@ -200,7 +200,7 @@ class RxErrorHandlingSpec extends RatpackGroovyDslSpec {
     thrownException == e
   }
 
-  def "on complete can throw"() {
+  def "on complete cannot throw"() {
     given:
     def e = new Exception("!")
 
@@ -213,7 +213,7 @@ class RxErrorHandlingSpec extends RatpackGroovyDslSpec {
 
     then:
     get()
-    thrownException == e
+    noExceptionThrown()
   }
 
   def "downstream handler can error"() {
@@ -338,7 +338,7 @@ class RxErrorHandlingSpec extends RatpackGroovyDslSpec {
     thrownException == e
   }
 
-  def "exception thrown by oncomplete throwns"() {
+  def "exception thrown by oncomplete is not re-thrown"() {
     given:
     def e = new Exception("!")
 
@@ -366,7 +366,7 @@ class RxErrorHandlingSpec extends RatpackGroovyDslSpec {
     }
 
     then:
-    thrownException == e
+      noExceptionThrown()
   }
 
 }