diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index d373a6e74..4d008a0bf 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -113,6 +113,8 @@ func RunServer(cmd, testfunc, args)
     endif
 
     call call(function(a:testfunc), [port])
+  catch /E901.*Address family for hostname not supported/
+    throw 'Skipped: Invalid network setup ("' .. v:exception .. '" in ' .. v:throwpoint .. ')'
   catch
     call assert_report('Caught exception: "' . v:exception . '" in ' . v:throwpoint)
   finally
diff --git a/src/version.c b/src/version.c
index 78c23fca6..1d0573e24 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2082,
 /**/
     2081,
 /**/