diff --git a/test/TestFetcherArpansa.hs b/test/Fetcher/ArpansaSpec.hs
similarity index 99%
rename from test/TestFetcherArpansa.hs
rename to test/Fetcher/ArpansaSpec.hs
index 3562c4a..1af4618 100644
--- a/test/TestFetcherArpansa.hs
+++ b/test/Fetcher/ArpansaSpec.hs
@@ -1,4 +1,4 @@
-module TestFetcherArpansa where
+module Fetcher.ArpansaSpec where
 
 import Control.Lens
 
diff --git a/test/TestFetcherJMA.hs b/test/Fetcher/JMASpec.hs
similarity index 99%
rename from test/TestFetcherJMA.hs
rename to test/Fetcher/JMASpec.hs
index 7448e16..e50fe39 100644
--- a/test/TestFetcherJMA.hs
+++ b/test/Fetcher/JMASpec.hs
@@ -1,4 +1,4 @@
-module TestFetcherJMA where
+module Fetcher.JMASpec where
 
 import Control.Lens
 
diff --git a/test/TestFetcher.hs b/test/FetcherSpec.hs
similarity index 98%
rename from test/TestFetcher.hs
rename to test/FetcherSpec.hs
index 47ed175..d115de0 100644
--- a/test/TestFetcher.hs
+++ b/test/FetcherSpec.hs
@@ -1,4 +1,4 @@
-module TestFetcher where
+module FetcherSpec where
 
 import Control.Lens
 
diff --git a/test/Integration/TestServer.hs b/test/Integration/ServerSpec.hs
similarity index 97%
rename from test/Integration/TestServer.hs
rename to test/Integration/ServerSpec.hs
index 13c25e2..943e1c6 100644
--- a/test/Integration/TestServer.hs
+++ b/test/Integration/ServerSpec.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
-module Integration.TestServer where
+module Integration.ServerSpec where
 
 import Control.Lens
 
diff --git a/test/Spec.hs b/test/Spec.hs
index 883643b..a824f8c 100644
--- a/test/Spec.hs
+++ b/test/Spec.hs
@@ -1,22 +1 @@
--- FIXME: Why doesn't hspec-discover work?
-import Test.Hspec
-
-import qualified TestFetcher
-import qualified TestFetcherArpansa
-import qualified TestFetcherJMA
-import qualified TestTypes
-import qualified TestTypesLocation
-import qualified TestUtils
-import qualified Integration.TestServer
-
-main :: IO ()
-main = hspec spec
-
-spec = do
-    describe "TestFetcher" TestFetcher.spec
-    describe "TestFetcherArpansa" TestFetcherArpansa.spec
-    describe "TestFetcherJMA" TestFetcherJMA.spec
-    describe "TestTypes" TestTypes.spec
-    describe "TestTypesLocation" TestTypesLocation.spec
-    describe "TestUtils" TestUtils.spec
-    describe "Integration.TestServer" Integration.TestServer.spec
+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}
diff --git a/test/TestTypesLocation.hs b/test/Types/LocationSpec.hs
similarity index 95%
rename from test/TestTypesLocation.hs
rename to test/Types/LocationSpec.hs
index fda96a8..16d052e 100644
--- a/test/TestTypesLocation.hs
+++ b/test/Types/LocationSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module TestTypesLocation where
+module Types.LocationSpec where
 
 {- Test Types.Location module -}
 
diff --git a/test/TestTypes.hs b/test/TypesSpec.hs
similarity index 98%
rename from test/TestTypes.hs
rename to test/TypesSpec.hs
index f628f48..1b11572 100644
--- a/test/TestTypes.hs
+++ b/test/TypesSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module TestTypes where
+module TypesSpec where
 
 {- Test Types module -}
 
diff --git a/test/TestUtils.hs b/test/UtilsSpec.hs
similarity index 99%
rename from test/TestUtils.hs
rename to test/UtilsSpec.hs
index 1abe5fd..50648b0 100644
--- a/test/TestUtils.hs
+++ b/test/UtilsSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module TestUtils where
+module UtilsSpec where
 
 {- Test Utils module -}
 
diff --git a/uv-alert-server.cabal b/uv-alert-server.cabal
index 2943e9f..51dc713 100644
--- a/uv-alert-server.cabal
+++ b/uv-alert-server.cabal
@@ -105,16 +105,16 @@ test-suite uv-alert-server-test
                      , transformers
                      , vector
                      , wai
-  other-modules:       Images
+  other-modules:       Fetcher.ArpansaSpec
+                     , Fetcher.JMASpec
+                     , FetcherSpec
+                     , Images
                      , Integration.Base
-                     , Integration.TestServer
+                     , Integration.ServerSpec
                      , Misc
-                     , TestFetcher
-                     , TestFetcherArpansa
-                     , TestFetcherJMA
-                     , TestTypes
-                     , TestTypesLocation
-                     , TestUtils
+                     , Types.LocationSpec
+                     , TypesSpec
+                     , UtilsSpec
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N
   default-language:    Haskell2010