diff --git a/Stackage/LoadDatabase.hs b/Stackage/LoadDatabase.hs
index e746d44e..85842195 100644
--- a/Stackage/LoadDatabase.hs
+++ b/Stackage/LoadDatabase.hs
@@ -178,7 +178,7 @@ loadPackageDB settings coreMap core deps = do
                 , if skipTests p
                     then mempty
                     else mconcat $ map (go gpd . snd) $ condTestSuites gpd
-                , mconcat $ map (go gpd . snd) $ condBenchmarks gpd
+                -- FIXME , mconcat $ map (go gpd . snd) $ condBenchmarks gpd
                 ], not $ null $ condTestSuites gpd
                 , Set.fromList $ map depName $ libExeBuildInfo gpd
                 , Set.fromList $ map depName $ testBenchBuildInfo gpd
diff --git a/Stackage/Select.hs b/Stackage/Select.hs
index a0b12223..dcc53cd5 100644
--- a/Stackage/Select.hs
+++ b/Stackage/Select.hs
@@ -43,7 +43,10 @@ defaultSelectSettings version = SelectSettings
     , disabledFlags = Set.fromList $ words "bytestring-in-base test-hlint"
     , allowedPackage = const $ Right ()
     , useGlobalDatabase = False
-    , skippedTests = empty
+    , skippedTests =
+        if version >= GhcMajorVersion 7 8
+            then Set.singleton (PackageName "punycode") -- pulls in encoding
+            else Set.empty
     , selectGhcVersion = version
     , selectTarballDir = "patching/tarballs"
     }