diff --git a/circle.yml b/circle.yml
index f512b7ad7..f6333bfb9 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,16 +1,21 @@
-machine:
+dependencies:
+  cache_directories:
+    - "~/.stack"
   pre:
+    - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442
+    - echo 'deb http://download.fpcomplete.com/ubuntu precise main'|sudo tee /etc/apt/sources.list.d/fpco.list
+    - sudo apt-get update && sudo apt-get install stack -y
     - createuser --superuser --no-password postgrest_test
     - createdb -O postgrest_test -U ubuntu postgrest_test
-  ghc:
-    version: 7.10.1
-dependencies:
   override:
-    - cabal update
-    - cabal sandbox init
-    - cabal install --upgrade-dependencies --constraint="template-haskell installed" --dependencies-only --enable-tests --reorder-goals
-    - cabal configure --enable-tests -f ci
+    - stack setup
+    - stack install hlint packdeps cabal-install
+
 test:
-  post:
-    - cabal exec hlint -- -X QuasiQuotes src/**/*.hs test/**/*.hs
-    - cabal exec packdeps postgrest.cabal || true
+  override:
+    - stack test
+    - git ls-files | grep '\.l\?hs$' | xargs stack exec -- hlint -X QuasiQuotes "$@"
+    - stack exec -- packdeps *.cabal || true
+    - stack exec -- cabal check
+    - stack haddock --coverage
+    - stack sdist
diff --git a/postgrest.cabal b/postgrest.cabal
index 8d855be62..14352ed33 100644
--- a/postgrest.cabal
+++ b/postgrest.cabal
@@ -30,7 +30,7 @@ executable postgrest
   main-is:             PostgREST/Main.hs
   default-extensions:  OverloadedStrings, ScopedTypeVariables, QuasiQuotes, LambdaCase
   default-language:    Haskell2010
-  build-depends:       aeson >= 0.8
+  build-depends:       aeson >= 0.8 && < 0.10
                      , base >= 4.8 && < 5
                      , bytestring
                      , case-insensitive
diff --git a/stack.yaml b/stack.yaml
index 2adf4b173..846ff18cf 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,8 +1,11 @@
-flags: {}
-packages:
-- '.'
+resolver: lts-5.0
 extra-deps:
   - hasql-0.19.3.3
   - Ranged-sets-0.3.0
   - packdeps-0.4.2.1
-resolver: lts-5.0
+# Almost all warnings, plus minimal-imports for packunused
+ghc-options:
+  postgrest: -ddump-minimal-imports -Werror -Wall -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -fwarn-monomorphism-restriction -fwarn-auto-orphans -fwarn-missing-local-sigs -fwarn-missing-exported-sigs -fwarn-missing-import-lists -fwarn-identities
+
+packages:
+- '.'