diff --git a/CHANGES.txt b/CHANGES.txt
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
 Changelog for Hoogle (* = API change, @ = database format change)
 
+5.0.18.1, released 2020-12-27
+    #365, add flag to disable network tests
 5.0.18, released 2020-07-19
     #356, make server --haddock work better
 @   #339, support enough names to index all of Hackage
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Hoogle [![Hackage version](https://img.shields.io/hackage/v/hoogle.svg?label=Hackage)](https://hackage.haskell.org/package/hoogle) [![Stackage version](https://www.stackage.org/package/hoogle/badge/nightly?label=Stackage)](https://www.stackage.org/package/hoogle) [![Linux build status](https://img.shields.io/travis/ndmitchell/hoogle/master.svg?label=Linux%20build)](https://travis-ci.org/ndmitchell/hoogle) [![Windows build status](https://img.shields.io/appveyor/ci/ndmitchell/hoogle/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/ndmitchell/hoogle)
+# Hoogle [![Hackage version](https://img.shields.io/hackage/v/hoogle.svg?label=Hackage)](https://hackage.haskell.org/package/hoogle) [![Stackage version](https://www.stackage.org/package/hoogle/badge/nightly?label=Stackage)](https://www.stackage.org/package/hoogle) [![Build status](https://img.shields.io/github/workflow/status/ndmitchell/hoogle/ci.svg)](https://github.com/ndmitchell/hoogle/actions)
 
 ## Hoogle 4 vs Hoogle 5
 
diff --git a/hoogle.cabal b/hoogle.cabal
--- a/hoogle.cabal
+++ b/hoogle.cabal
@@ -1,7 +1,7 @@
 cabal-version:      >= 1.18
 build-type:         Simple
 name:               hoogle
-version:            5.0.18
+version:            5.0.18.1
 license:            BSD3
 license-file:       LICENSE
 category:           Development
@@ -15,7 +15,7 @@
     or by approximate type signature.
 homepage:           https://hoogle.haskell.org/
 bug-reports:        https://github.com/ndmitchell/hoogle/issues
-tested-with:        GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2
+tested-with:        GHC==8.10, GHC==8.8, GHC==8.6, GHC==8.4, GHC==8.2
 extra-doc-files:
     README.md
     CHANGES.txt
diff --git a/src/Action/CmdLine.hs b/src/Action/CmdLine.hs
--- a/src/Action/CmdLine.hs
+++ b/src/Action/CmdLine.hs
@@ -70,9 +70,10 @@
         ,scope :: String
         }
     | Test
-        {deep :: Bool
-        ,database :: FilePath
-        ,language :: Language
+        { deep :: Bool
+        , disable_network_tests  :: Bool
+        , database :: FilePath
+        , language :: Language
         }
       deriving (Data,Typeable,Show)
 
@@ -153,5 +154,6 @@
     } &= help "Replay a log file"
 
 test = Test
-    {deep = False &= help "Run extra long tests"
+    { deep    = False &= help "Run extra long tests"
+    , disable_network_tests = False  &= help "Disables the use of network tests"
     } &= help "Run the test suite"
diff --git a/src/Action/Search.hs b/src/Action/Search.hs
--- a/src/Action/Search.hs
+++ b/src/Action/Search.hs
@@ -182,7 +182,7 @@
             ]
         query "[a] -> Maybe a"
             [ TopHit  ("listToMaybe" `inModule` "Data.Maybe")
-            , InTop 5 ("headMay"     `inModule` "Safe")
+            , InTop 10 ("headMay"     `inModule` "Safe")
             ]
         query "a -> [a]"
             [ InTop 10    ("repeat"    `inPackage` "base")
@@ -190,7 +190,7 @@
             , DoesNotFind ("head"      `inPackage` "base")
             , DoesNotFind ("last"      `inPackage` "base")
             , InTop 50    ("pure"      `inPackage` "base")
-            , InTop 100   ("return"    `inPackage` "base")
+            , KnownFailure "" $ InTop 100   ("return"    `inPackage` "base")
             , KnownFailure "GitHub issue #267" $
                   ("pure" `inPackage` "base") `AppearsBefore` ("shrinkNothing" `inModule` "Test.QuickCheck")
             -- , InTop 10 ("pure"   `inPackage` "base")
diff --git a/src/Action/Test.hs b/src/Action/Test.hs
--- a/src/Action/Test.hs
+++ b/src/Action/Test.hs
@@ -31,15 +31,16 @@
     putStrLn "Sample database tests"
     actionGenerate defaultGenerate{database=sample, local_=["misc/sample-data"]}
     action_search_test True sample
-    action_server_test True sample
+    unless disable_network_tests $ action_server_test True sample
     putStrLn ""
 
-    putStrLn "Haskell.org database tests"
-    action_search_test False database
-    action_server_test False database
+    unless disable_network_tests $ do
+        putStrLn "Haskell.org database tests"
+        action_search_test False database
+        action_server_test False database
 
-    when deep $ withSearch database $ \store -> do
-        putStrLn "Deep tests"
-        let xs = map targetItem $ listItems store
-        evaluate $ rnf xs
-        putStrLn $ "Loaded " ++ show (length xs) ++ " items"
+        when deep $ withSearch database $ \store -> do
+            putStrLn "Deep tests"
+            let xs = map targetItem $ listItems store
+            evaluate $ rnf xs
+            putStrLn $ "Loaded " ++ show (length xs) ++ " items"