diff --git a/.travis.yml b/.travis.yml
index 96d9ac8..d7651ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,29 @@
-language: haskell
+language: c
 
-ghc:
- - 7.8
- - 7.6
- - 7.4
+sudo: false
+
+matrix:
+  include:
+    - env: CABALVER=1.22 GHCVER=7.8.4
+      addons: {apt: {packages: [cabal-install-1.22,ghc-7.8.4], sources: [hvr-ghc]}}
+    - env: CABALVER=1.22 GHCVER=7.10.3
+      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}}
 
 before_install:
-  - cabal sandbox init
-  - for i in `cat REPOS`; do git clone http://github.com/haskell-distributed/$i; done
-  - for i in `cat REPOS`; do cabal sandbox add-source $i; done
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq binutils-dev
+  - mkdir -p ~/.local/bin
+  - export PATH=~/.local/bin:$PATH
+  - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar -xzO --wildcards '*/stack' > ~/.local/bin/stack
+  - chmod a+x ~/.local/bin/stack
+  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
 install:
-  # Don't run tests for dependencies.
-  - cabal install --only-dependencies
-  - cabal install --only-dependencies distributed-process-tests
+  - stack -j 2 setup --no-terminal --no-install-ghc --skip-ghc-check
+  - stack -j 2 build --only-snapshot --no-terminal --system-ghc --skip-ghc-check
 
 script:
-  - cabal install
-  - cabal install --enable-tests -j1 distributed-process-tests
+  - stack -j 2 test --no-terminal --system-ghc
+
+notifications:
+  slack:
+    secure: g0NP1tkOe3+kI6O0Q1mgT/jPaLjxQ31J26MWouicu2F1Y3p73qTvv/QsOkafRMZDn07HlzgviCP25r7Ytg32pUAFvOh4U4MT2MpO0jUVVGPi4ZiwB+W5AH+HlDtJSickeSZ0AjXZSaGv8nQNegWkeaLQgLBIzrTHU8s0Y9K+whQ=
+
diff --git a/distributed-process-async.cabal b/distributed-process-async.cabal
index 0f5d113..cd3697d 100644
--- a/distributed-process-async.cabal
+++ b/distributed-process-async.cabal
@@ -5,9 +5,9 @@ build-type:     Simple
 license:        BSD3
 license-file:   LICENCE
 stability:      experimental
-Copyright:      Tim Watson 2012 - 2014
+Copyright:      Tim Watson 2012 - 2016
 Author:         Tim Watson
-Maintainer:     watson.timothy@gmail.com
+Maintainer:     Tim Watson <watson.timothy@gmail.com>
 Stability:      experimental
 Homepage:       http://github.com/haskell-distributed/distributed-process-async
 Bug-Reports:    http://github.com/haskell-distributed/distributed-process-async/issues
@@ -16,7 +16,7 @@ description:    This package provides a higher-level interface over Processes, i
                 concurrent, possibly distributed Process that will eventually deliver a value of type a.
                 The package provides ways to create Async computations, wait for their results, and cancel them.
 category:       Control
-tested-with:    GHC == 7.4.2 GHC == 7.6.2
+tested-with:    GHC == 7.8.4 GHC == 7.10.3
 data-dir:       ""
 
 source-repository head
@@ -31,8 +31,8 @@ library
   build-depends:
                    base >= 4.4 && < 5,
                    data-accessor >= 0.2.2.3,
-                   distributed-process >= 0.5.3 && < 0.7,
-                   distributed-process-extras >= 0.2.0 && < 0.3,
+                   distributed-process >= 0.6.1 && < 0.7,
+                   distributed-process-extras >= 0.2.1.2 && < 0.3,
                    binary >= 0.6.3.0 && < 0.8,
                    deepseq >= 1.3.0.1 && < 1.5,
                    mtl,
@@ -63,10 +63,10 @@ test-suite AsyncTests
   build-depends:
                    base >= 4.4 && < 5,
                    ansi-terminal >= 0.5 && < 0.7,
-                   distributed-process >= 0.5.3 && < 0.7,
-                   distributed-process-extras >= 0.2.0 && < 0.3,
+                   distributed-process >= 0.6.1 && < 0.7,
+                   distributed-process-extras >= 0.2.1.2 && < 0.3,
                    distributed-process-async,
-                   distributed-process-tests >= 0.4.1 && < 0.5,
+                   distributed-process-systest >= 0.1.0 && < 0.2.0,                
                    network >= 2.5 && < 2.7,
                    network-transport >= 0.4 && < 0.5,
                    network-transport-tcp >= 0.4 && < 0.6,
diff --git a/src/Control/Distributed/Process/Async.hs b/src/Control/Distributed/Process/Async.hs
index d61a374..d336ad5 100644
--- a/src/Control/Distributed/Process/Async.hs
+++ b/src/Control/Distributed/Process/Async.hs
@@ -65,7 +65,7 @@ import Prelude hiding (catch)
 
 import Control.Applicative
 import Control.Concurrent.STM hiding (check)
-import Control.Distributed.Process
+import Control.Distributed.Process hiding (catch)
 import Control.Distributed.Process.Serializable
 import Control.Distributed.Process.Async.Internal.Types
 import Control.Distributed.Process.Extras
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000..74cc0d6
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1,15 @@
+resolver: nightly-2016-03-02
+packages:
+- .
+- location:
+    git: https://github.com/haskell-distributed/distributed-process-systest.git
+    commit: HEAD
+
+extra-deps:
+- distributed-static-0.3.2.0
+- distributed-process-0.6.1
+- distributed-process-extras-0.2.1.2
+- network-transport-tcp-0.5.1
+- rank1dynamic-0.3.1.0
+- rematch-0.2.0.0
+
diff --git a/tests/TestAsync.hs b/tests/TestAsync.hs
index 72ddd84..38e4eff 100644
--- a/tests/TestAsync.hs
+++ b/tests/TestAsync.hs
@@ -12,10 +12,9 @@ import Control.Distributed.Process.Node
 import Control.Distributed.Process.Serializable()
 import Control.Distributed.Process.Async
 import Control.Distributed.Process.Extras (Routable(..), Resolvable(..))
-import Control.Distributed.Process.Tests.Internal.Utils
+import Control.Distributed.Process.SysTest.Utils
 import Control.Distributed.Process.Extras.Time
 import Control.Distributed.Process.Extras.Timer
-import Control.Distributed.Process.Tests.Internal.Utils (delayedAssertion)
 import Data.Binary()
 import Data.Typeable()
 import Network.Transport.TCP