diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Revision history for spacecookie
 
+## 1.0.0.2
+
+2022-10-03
+
+* Work around [cabal#8458](https://github.com/haskell/cabal/issues/8458),
+  ensuring that the test suite can be compiled with `cabal-install` 3.8.1.0.
+* Always compile test suite with `-threaded` to avoid random
+  `CurlBadFunctionArg` exceptions when executing integration tests.
+
 ## 1.0.0.1
 
 2021-11-29
diff --git a/spacecookie.cabal b/spacecookie.cabal
--- a/spacecookie.cabal
+++ b/spacecookie.cabal
@@ -1,6 +1,6 @@
 cabal-version:       3.0
 name:                spacecookie
-version:             1.0.0.1
+version:             1.0.0.2
 synopsis:            Gopher server library and daemon
 description:         Simple gopher library that allows writing custom gopher
                      applications. Also includes a fully-featured gopher server
@@ -8,7 +8,7 @@
 license:             GPL-3.0-only
 license-file:        LICENSE
 author:              Lukas Epple
-maintainer:          sterni-spacecookie@systemli.org
+maintainer:          sternenseemann@systemli.org
 category:            Network
 build-type:          Simple
 homepage:            https://github.com/sternenseemann/spacecookie
@@ -40,7 +40,19 @@
                      , directory >= 1.3
                      , filepath-bytestring >=1.4
                      , containers >= 0.6
+  ghc-options:
+      -Wall
+      -Wno-orphans
 
+common common-executables
+  ghc-options:
+      -- Needed by curl to work reliably in the test suite
+      -- https://github.com/GaloisInc/curl/pull/25
+      -threaded
+      -- Limit frequency of the idle GC to every 10s
+      -rtsopts
+      -with-rtsopts=-I10
+
 common gopher-dependencies
   build-depends:       unix >= 2.7
                      , socket >= 0.8.2
@@ -49,7 +61,7 @@
                      , text >= 1.2
 
 executable spacecookie
-  import:              common-settings, gopher-dependencies
+  import:              common-settings, common-executables, gopher-dependencies
   main-is:             Main.hs
   build-depends:       spacecookie
                      , aeson >= 1.5
@@ -61,7 +73,6 @@
                      , Network.Spacecookie.FileType
                      , Paths_spacecookie
   autogen-modules:     Paths_spacecookie
-  ghc-options:         -Wall -Wno-orphans -rtsopts -with-rtsopts=-I10 -threaded
 
 library
   import:              common-settings, gopher-dependencies
@@ -74,12 +85,11 @@
                      , Network.Gopher.Util.Socket
   build-depends:       hxt-unicode >= 9.0
                      , async >= 2.2
-  ghc-options:         -Wall -Wno-orphans
 
 test-suite test
-  import:              common-settings
+  import:              common-settings, common-executables
   type:                exitcode-stdio-1.0
-  main-is:             Main.hs
+  main-is:             EntryPoint.hs
   hs-source-dirs:      test, server
   other-modules:       Test.FileTypeDetection
                      , Test.Gophermap
@@ -91,7 +101,6 @@
                      , spacecookie
                      , process >=1.2.0
                      , download-curl >=0.1
-  ghc-options:         -Wall -Wno-orphans
 
 source-repository head
   type: git
diff --git a/test/EntryPoint.hs b/test/EntryPoint.hs
new file mode 100644
--- /dev/null
+++ b/test/EntryPoint.hs
@@ -0,0 +1,20 @@
+module Main where
+
+import Test.Tasty
+
+-- library tests
+import Test.Gophermap
+
+-- server executable tests
+import Test.FileTypeDetection
+import Test.Integration
+
+main :: IO ()
+main = defaultMain tests
+
+tests :: TestTree
+tests = testGroup "tests"
+  [ gophermapTests
+  , fileTypeDetectionTests
+  , integrationTests
+  ]
diff --git a/test/Main.hs b/test/Main.hs
deleted file mode 100644
--- a/test/Main.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-module Main where
-
-import Test.Tasty
-
--- library tests
-import Test.Gophermap
-
--- server executable tests
-import Test.FileTypeDetection
-import Test.Integration
-
-main :: IO ()
-main = defaultMain tests
-
-tests :: TestTree
-tests = testGroup "tests"
-  [ gophermapTests
-  , fileTypeDetectionTests
-  , integrationTests
-  ]