diff --git a/.travis.yml b/.travis.yml
index 4056bc8b3..e37918195 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 language: python
 
 python:
@@ -6,14 +5,8 @@ python:
   - "3.6"
 
 install: pip install tox-travis coverage
-
-script:
-  - tox
+script: tox
 
 after_success:
   - coverage combine tests/
   - bash <(curl -s https://codecov.io/bash)
-
-branches:
-  only: 
-    - master
diff --git a/torba/stream.py b/torba/stream.py
index a5f3f63c9..6438b7184 100644
--- a/torba/stream.py
+++ b/torba/stream.py
@@ -128,7 +128,7 @@ class Stream:
     def listen(self, on_data, on_error=None, on_done=None):
         return self._controller._listen(on_data, on_error, on_done)
 
-    def where(self, condition):
+    def deferred_where(self, condition):
         deferred = Deferred()
 
         def where_test(value):
@@ -142,8 +142,8 @@ class Stream:
 
         return deferred
 
-    def async_where(self, condition):
-        return self.where(condition).asFuture(asyncio.get_event_loop())
+    def where(self, condition):
+        return self.deferred_where(condition).asFuture(asyncio.get_event_loop())
 
     @property
     def first(self):