diff --git a/tests/Makefile.am b/tests/Makefile.am
index fb53eca3..dbd110cf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -140,7 +140,7 @@ PX_TESTS = \
 
 EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
              SSLTest.pm SSLServer.pm \
-             WgetTests.pm WgetFeature.pm WgetFeature.cfg $(PX_TESTS) \
+             WgetTests.pm WgetFeature.pm $(PX_TESTS) \
              certs valgrind-suppressions valgrind-suppressions-ssl
 
 check_PROGRAMS = unit-tests
diff --git a/tests/WgetFeature.cfg b/tests/WgetFeature.cfg
deleted file mode 100644
index a1176e03..00000000
--- a/tests/WgetFeature.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-%skip_messages = (
-    https => "Not running test: Wget under test doesn't support HTTPS.",
-    iri   => "Not running test: Wget under test doesn't support IDN/IRI.",
-);
-
-1;
diff --git a/tests/WgetFeature.pm b/tests/WgetFeature.pm
index 28e0c114..0d595731 100644
--- a/tests/WgetFeature.pm
+++ b/tests/WgetFeature.pm
@@ -5,26 +5,14 @@ use warnings;
 
 our $VERSION = 0.01;
 
-use Carp;
 use English qw(-no_match_vars);
-use FindBin;
 use WgetTests;
 
-our %SKIP_MESSAGES;
-{
-    my $cfgfile = "$FindBin::Bin/WgetFeature.cfg";
-    open my $fh, '<', $cfgfile
-      or croak "Cannot open '$cfgfile': $ERRNO";
-    my @lines = <$fh>;
-    close $fh or carp "Cannot close '$cfgfile': $ERRNO";
-    my $evalstr = join q{}, @lines;
-    eval { $evalstr } or carp "Cannot eval '$cfgfile': $ERRNO";
-}
-
 sub import
 {
-    my ($class, $feature) = @_;
+    my ($class, @required_feature) = @_;
 
+    # create a list of available features from 'wget --version' output
     my $output = `$WgetTest::WGETPATH --version`;
     my ($list) = $output =~ m/^([+-]\S+(?:\s+[+-]\S+)+)/msx;
     my %have_features;
@@ -34,10 +22,19 @@ sub import
         $feat =~ s/^.//msx;
         $have_features{$feat} = $f =~ m/^[+]/msx ? 1 : 0;
     }
-    if (!$have_features{$feature})
+
+    foreach (@required_feature)
     {
-        print "$SKIP_MESSAGES{$feature}\n";
-        exit 77;    # skip
+        if (!$have_features{$_})
+        {
+            print "Skipped test: Wget misses feature '$_'\n";
+            print "Features available from 'wget --version' output:\n";
+            foreach (keys %have_features)
+            {
+                print "    $_=$have_features{$_}\n";
+            }
+            exit 77; # skip
+        }
     }
 }