diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a662ce2..8fdff61f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@
   jobs:
     build-job:
       name: Build distribution
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-latest
       container:
         image: perldocker/perl-tester:5.34
       steps:
@@ -33,7 +33,7 @@
           if: ${{ github.actor != 'nektos/act' }}
     coverage-job:
       needs: build-job
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-latest
       container:
         image: perldocker/perl-tester:5.34
       steps:
@@ -49,7 +49,7 @@
     test-job:
       needs: build-job
       strategy:
-        fail-fast: true
+        fail-fast: false
         matrix:
           os: [ubuntu-latest, macos-latest, windows-latest]
           distribution: [default, strawberry]
@@ -97,4 +97,4 @@
         - run: prove -lr t
           env:
             AUTHOR_TESTING: 0
-            RELEASE_TESTING: 0
\ No newline at end of file
+            RELEASE_TESTING: 0
diff --git a/Changes b/Changes
index 532299c7..244ca30b 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 {{$NEXT}}
 
+    - Migrate from List::MoreUtils to List::SomeUtils
+
     - Remove unused variables etc #gh69 thanks to Steve Rogerson @yewtc
 
 2.08      2021-01-15 10:16:00+00:00 UTC
diff --git a/dist.ini b/dist.ini
index 47cd3b43..dc89b2ee 100644
--- a/dist.ini
+++ b/dist.ini
@@ -44,7 +44,7 @@ HTML::TokeParser::Simple = 3.14
 HTTP::Headers = 1.64
 IO::File = 0
 JSON::MaybeXS = 0
-List::MoreUtils = 0
+List::SomeUtils = 0
 List::Util = 1.45
 Locale::Maketext = 0
 Module::Pluggable = 0
diff --git a/lib/HTML/FormFu/Localize.pm b/lib/HTML/FormFu/Localize.pm
index 41b227f5..44d4023e 100644
--- a/lib/HTML/FormFu/Localize.pm
+++ b/lib/HTML/FormFu/Localize.pm
@@ -7,7 +7,7 @@ use warnings;
 
 use HTML::FormFu::Util qw( require_class );
 use List::Util 1.33 qw( any );
-use List::MoreUtils qw( pairwise );
+use List::SomeUtils qw( pairwise );
 use Scalar::Util qw( weaken isweak blessed );
 use Exporter qw( import );
 use Carp qw( croak );
diff --git a/lib/HTML/FormFu/Role/Element/Layout.pm b/lib/HTML/FormFu/Role/Element/Layout.pm
index 5a2e2c50..d94c97cc 100644
--- a/lib/HTML/FormFu/Role/Element/Layout.pm
+++ b/lib/HTML/FormFu/Role/Element/Layout.pm
@@ -7,7 +7,7 @@ use Moose::Role;
 use MooseX::Attribute::Chained;
 
 use Carp qw( carp croak );
-use List::MoreUtils qw( first_index );
+use List::SomeUtils qw( first_index );
 use Scalar::Util qw( reftype );
 
 use HTML::FormFu::Util qw( process_attrs );
diff --git a/t/constraints/email-mx.t b/t/constraints/email-mx.t
index d8a29e3c..c6355692 100644
--- a/t/constraints/email-mx.t
+++ b/t/constraints/email-mx.t
@@ -2,7 +2,17 @@ use strict;
 use warnings;
 
 use Test::RequiresInternet 'cpan.org' => 80;
-use Test::More tests                  => 3;
+use Test::More;
+
+# Net::DNS < 1.10 can't find nameservers on Windows when the IP is
+# DHCP-assigned (fixed in Net::DNS 1.10), so mxcheck always fails there.
+if ( $^O eq 'MSWin32'
+    && !eval { require Net::DNS; Net::DNS->VERSION('1.10'); 1 } )
+{
+    plan skip_all => 'Net::DNS >= 1.10 required for mxcheck on Windows';
+}
+
+plan tests => 3;
 
 use HTML::FormFu;