diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 See full history at: <https://github.com/faylang/fay/commits>
 
+#### 0.20.1.3 (2014-08-29)
+
+* `fay-tests` is no longer built by default. Pass `-ftest` to build it.
+
 #### 0.20.1.2 (2014-08-18)
 
 * Updated homepage URLs, fay-lang.org was 301'd
diff --git a/fay.cabal b/fay.cabal
--- a/fay.cabal
+++ b/fay.cabal
@@ -1,5 +1,5 @@
 name:                fay
-version:             0.20.1.2
+version:             0.20.1.3
 synopsis:            A compiler for Fay, a Haskell subset that compiles to JavaScript.
 description:         Fay is a proper subset of Haskell which is type-checked
                      with GHC, and compiled to JavaScript. It is lazy, pure, has a Fay monad,
@@ -66,6 +66,11 @@
   type: git
   location: https://github.com/faylang/fay.git
 
+flag test
+  description:       Build the fay-tests executable
+  manual:            True
+  default:           False
+
 library
   ghc-options:       -O2 -Wall
   hs-source-dirs:    src
@@ -151,24 +156,27 @@
   ghc-prof-options:  -fprof-auto
   hs-source-dirs:    src/tests
   main-is:           Tests.hs
-  other-modules:
-    Test.CommandLine
-    Test.Compile
-    Test.Convert
-    Test.Desugar
-    Test.Util
-  build-depends:
-      base
-    , aeson
-    , attoparsec
-    , bytestring
-    , directory
-    , fay
-    , filepath
-    , groom == 0.1.*
-    , haskell-src-exts
-    , tasty == 0.8.*
-    , tasty-hunit >= 0.8 && < 0.10
-    , tasty-th == 0.1.*
-    , text
-    , utf8-string
+  if flag(test)
+    other-modules:
+      Test.CommandLine
+      Test.Compile
+      Test.Convert
+      Test.Desugar
+      Test.Util
+    build-depends:
+        base
+      , aeson
+      , attoparsec
+      , bytestring
+      , directory
+      , fay
+      , filepath
+      , groom == 0.1.*
+      , haskell-src-exts
+      , tasty == 0.8.*
+      , tasty-hunit >= 0.8 && < 0.10
+      , tasty-th == 0.1.*
+      , text
+      , utf8-string
+  else
+    buildable:         False