diff --git a/build.yaml b/build.yaml
index d5c114e1e2..c38d370c71 100644
--- a/build.yaml
+++ b/build.yaml
@@ -99,7 +99,7 @@ python:
   - 3.6
 
 os:
-  - ubuntu/trusty64
+  - ubuntu/bionic64/python-driver
 
 cassandra:
   - '2.1'
@@ -122,9 +122,7 @@ build:
       pip install --upgrade pip
       pip install -U setuptools
 
-      pip install git+https://github.com/pcmanus/ccm.git
-      # Install dependencies
-      sudo apt-get install -y libev4 libev-dev libssl-dev
+      pip install git+https://github.com/riptano/ccm.git
 
       pip install -r test-requirements.txt
       pip install nose-ignore-docstring
@@ -143,15 +141,6 @@ build:
         python setup.py build_ext --inplace --no-cython
       fi
 
-      echo "Installing simulacron"
-      pushd ~
-
-      SIMULACRON_JAR=`find \`pwd\` -name "simulacron-standalone-*.jar"`
-      echo "SIMULACRON_JAR: $SIMULACRON_JAR"
-
-      popd
-
-
       echo "JUST_UPGRADE: $JUST_UPGRADE"
       if [[ $JUST_UPGRADE == 'True' ]]; then
         EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=upgrade_results.xml tests/integration/upgrade || true
@@ -170,6 +159,7 @@ build:
 
       echo "Running with event loop manager: $EVENT_LOOP_MANAGER"
       echo "==========RUNNING SIMULACRON TESTS=========="
+      SIMULACRON_JAR="$HOME/simulacron.jar"
       SIMULACRON_JAR=$SIMULACRON_JAR EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CASSANDRA_DIR=$CCM_INSTALL_DIR DSE_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=simulacron_results.xml tests/integration/simulacron/ || true
 
       echo "Running with event loop manager: $EVENT_LOOP_MANAGER"
diff --git a/tests/unit/io/test_asyncioreactor.py b/tests/unit/io/test_asyncioreactor.py
index 3458ecbcbc..be3c2bcd2e 100644
--- a/tests/unit/io/test_asyncioreactor.py
+++ b/tests/unit/io/test_asyncioreactor.py
@@ -3,7 +3,7 @@
     import asynctest
     ASYNCIO_AVAILABLE = True
 except (ImportError, SyntaxError):
-    AysncioConnection = None
+    AsyncioConnection = None
     ASYNCIO_AVAILABLE = False
 
 from tests import is_monkey_patched, connection_class