diff --git a/.travis.yml b/.travis.yml
index e9c9930aed80a04032d0a8b771a4122de6631434..71047893b3af953c5fbb576468044f9454d8e5b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,28 @@ env:
   - TOXENV=pypy
 
 install:
-  - "[[ ${TOXENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true"
-  - "[[ ${TOXENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true"
+  # Add the PyPy repository
+  - "if [[ $TOXENV == 'pypy' ]]; then sudo add-apt-repository -y ppa:pypy/ppa; fi"
+  # Upgrade PyPy
+  - "if [[ $TOXENV == 'pypy' ]]; then sudo apt-get -y install pypy; fi"
   # This is required because we need to get rid of the Travis installed PyPy
   # or it'll take precedence over the PPA installed one.
-  - "[[ ${TOXENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin || true"
+  - "if [[ $TOXENV == 'pypy' ]]; then sudo rm -rf /usr/local/pypy/bin; fi"
   - pip install tox coveralls
 
+
 script:
-  - tox -e $TOXENV
+  - tox
+
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#cryptography-dev"
+    use_notice: true
+    skip_join: true
+
+
+matrix:
+  allow_failures:
+    # There is a segfault issue with PyPy
+    - env: TOXENV=pypy