diff --git a/.gitignore b/.gitignore
index 24e3f179b..8e0e4433d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,5 @@ data
 build
 cache
 *~
-tests/elm/build/
-tests/elm/cache/
-tests/elm/exe.js
+exe.js
 node_modules/
diff --git a/Elm.cabal b/Elm.cabal
index 04ea705a6..1486c4134 100644
--- a/Elm.cabal
+++ b/Elm.cabal
@@ -243,7 +243,7 @@ Executable elm-doc
 
 Test-Suite compiler-tests
   Type:            exitcode-stdio-1.0
-  Hs-Source-Dirs:  tests/hs, compiler
+  Hs-Source-Dirs:  tests/compiler, compiler
   Main-is:         CompilerTest.hs
   other-modules:   Tests.Compiler
                    Tests.Property
@@ -281,10 +281,10 @@ Test-Suite compiler-tests
                    union-find,
                    unordered-containers
 
-Test-Suite lib-tests
+Test-Suite library-tests
   Type:            exitcode-stdio-1.0
-  Hs-Source-Dirs:  tests/hs
-  Main-is:         LibTest.hs
+  Hs-Source-Dirs:  tests/libraries
+  Main-is:         LibraryTest.hs
   build-depends:   base,
                    directory,
                    Elm,
diff --git a/tests/compiler/LibTest.hs b/tests/libraries/LibraryTest.hs
similarity index 100%
rename from tests/compiler/LibTest.hs
rename to tests/libraries/LibraryTest.hs