diff --git a/test/spec/Feature/AsymmetricJwtSpec.hs b/test/spec/Feature/AsymmetricJwtSpec.hs
index c2c46b23a..44597a64e 100644
--- a/test/spec/Feature/AsymmetricJwtSpec.hs
+++ b/test/spec/Feature/AsymmetricJwtSpec.hs
@@ -1,6 +1,5 @@
 module Feature.AsymmetricJwtSpec where
 
--- {{{ Imports
 import Network.Wai (Application)
 
 import Network.HTTP.Types
@@ -9,7 +8,6 @@ import Test.Hspec.Wai
 
 import Protolude
 import SpecHelper
--- }}}
 
 spec :: SpecWith ((), Application)
 spec = describe "server started with asymmetric JWK" $
diff --git a/test/spec/Feature/AudienceJwtSecretSpec.hs b/test/spec/Feature/AudienceJwtSecretSpec.hs
index e5a91ff30..1302e02e6 100644
--- a/test/spec/Feature/AudienceJwtSecretSpec.hs
+++ b/test/spec/Feature/AudienceJwtSecretSpec.hs
@@ -1,6 +1,5 @@
 module Feature.AudienceJwtSecretSpec where
 
--- {{{ Imports
 import Network.Wai (Application)
 
 import Network.HTTP.Types
@@ -9,7 +8,6 @@ import Test.Hspec.Wai
 
 import Protolude  hiding (get)
 import SpecHelper
--- }}}
 
 spec :: SpecWith ((), Application)
 spec = describe "test handling of aud claims in JWT" $ do
diff --git a/test/spec/Feature/BinaryJwtSecretSpec.hs b/test/spec/Feature/BinaryJwtSecretSpec.hs
index 599f7e2f2..996243d1a 100644
--- a/test/spec/Feature/BinaryJwtSecretSpec.hs
+++ b/test/spec/Feature/BinaryJwtSecretSpec.hs
@@ -1,6 +1,5 @@
 module Feature.BinaryJwtSecretSpec where
 
--- {{{ Imports
 import Network.Wai (Application)
 
 import Network.HTTP.Types
@@ -9,7 +8,6 @@ import Test.Hspec.Wai
 
 import Protolude
 import SpecHelper
--- }}}
 
 spec :: SpecWith ((), Application)
 spec = describe "server started with binary JWT secret" $
diff --git a/test/spec/Feature/NoJwtSpec.hs b/test/spec/Feature/NoJwtSpec.hs
index 4e7b65242..770a0afce 100644
--- a/test/spec/Feature/NoJwtSpec.hs
+++ b/test/spec/Feature/NoJwtSpec.hs
@@ -1,7 +1,5 @@
 module Feature.NoJwtSpec where
 
--- {{{ Imports
-
 import Network.Wai (Application)
 
 import Network.HTTP.Types
@@ -9,23 +7,21 @@ import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 
-import Protolude
+import Protolude  hiding (get)
 import SpecHelper
--- }}}
 
 spec :: SpecWith ((), Application)
 spec = describe "server started without JWT secret" $ do
 
-  -- this test will stop working 9999999999s after the UNIX EPOCH
   it "responds with error on attempted auth" $ do
-    let auth = authHeaderJWT "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjk5OTk5OTk5OTksInJvbGUiOiJwb3N0Z3Jlc3RfdGVzdF9hdXRob3IiLCJpZCI6Impkb2UifQ.Dpss-QoLYjec5OTsOaAc3FNVsSjA89wACoV-0ra3ClA"
-    request methodGet "/authors_only" [auth] ""
+    -- token body: { "role": "postgrest_test_author" }
+    let auth = authHeaderJWT "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoicG9zdGdyZXN0X3Rlc3RfYXV0aG9yIn0.Xod-F15qsGL0WhdOCr2j3DdKuTw9QJERVgoFD3vGaWA"
+    request methodGet "/authors_only"
+        [auth]
+        ""
       `shouldRespondWith`
-      [json|{"message":"Server lacks JWT secret"}|]
-      { matchStatus  = 500
-      , matchHeaders = [ matchContentTypeJson ]
-      }
+        [json|{"message":"Server lacks JWT secret"}|]
+        { matchStatus  = 500 }
 
   it "behaves normally when user does not attempt auth" $
-    request methodGet "/items" [] ""
-      `shouldRespondWith` 200
+    get "/items" `shouldRespondWith` 200