diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..2ae3719e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,112 @@
+---
+name: CI
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - 'release/**'
+  pull_request:
+    branches:
+      - develop
+      - master
+      - 'release/**'
+
+jobs:
+  run-tests:
+    strategy:
+      matrix:
+        compatibility:
+          - develop
+          # - latest
+        perl:
+          - '5.40'
+          - '5.36'
+          - '5.26'
+        runner:
+          - ubuntu-22.04
+
+    runs-on: ${{ matrix.runner }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: shogo82148/actions-setup-perl@v1
+        with:
+          perl-version: ${{ matrix.perl }}
+
+      - name: Install binary dependencies
+        run: |
+          # * These were taken from the installation instruction.
+          # * Gettext was added so we can run cpanm . on the Engine sources.
+          # * The Perl modules were left out because I couldn't get all of them
+          #   to work with custom Perl versions.
+          # * Cpanminus was left out because actions-setup-perl installs it.
+          sudo apt-get install -y \
+            autoconf \
+            automake \
+            build-essential \
+            gettext \
+            libidn2-dev \
+            libssl-dev \
+            libtool \
+            m4 \
+
+      - name: Install Zonemaster dependencies (latest)
+        if: ${{ matrix.compatibility == 'latest' }}
+        run: |
+          cpanm --sudo --notest \
+            Module::Install \
+            ExtUtils::PkgConfig \
+            Zonemaster::Engine
+
+      - name: Install Zonemaster dependencies (develop)
+        if: ${{ matrix.compatibility == 'develop' }}
+        run: |
+          cpanm --sudo --notest \
+            Devel::CheckLib \
+            Module::Install \
+            ExtUtils::PkgConfig \
+            Module::Install::XSUtil
+          git clone --branch=develop --depth=1 \
+            https://github.com/zonemaster/zonemaster-ldns.git
+          perl Makefile.PL  # Generate MYMETA.yml to appease cpanm .
+          ( cd zonemaster-ldns ; cpanm --sudo --notest . )
+          rm -rf zonemaster-ldns
+          git clone --branch=develop --depth=1 \
+            https://github.com/zonemaster/zonemaster-engine.git
+          perl Makefile.PL  # Generate MYMETA.yml to appease cpanm .
+          ( cd zonemaster-engine ; cpanm --sudo --notest . )
+          rm -rf zonemaster-engine
+
+        # Installing Zonemaster::Engine requires root privileges, because of a
+        # bug in Mail::SPF preventing normal installation with cpanm as
+        # non-root user (see link below [1]).
+        #
+        # The alternative, if one still wishes to install Zonemaster::Engine
+        # as non-root user, is to install Mail::SPF first with a command like:
+        #
+        #  % cpanm --notest \
+        #        --install-args="--install_path sbin=$HOME/.local/sbin" \
+        #        Mail::SPF
+        #
+        # For the sake of consistency, other Perl packages installed from CPAN
+        # are also installed as root.
+        #
+        # [1]: https://rt.cpan.org/Public/Bug/Display.html?id=34768
+      - name: Install remaining dependencies
+        run: |
+          cpanm --sudo --verbose --notest --installdeps .
+
+      - name: Install Zonemaster::CLI
+        run: |
+          cpanm --sudo --verbose --notest .
+
+      - name: Show content of log files
+        if: ${{ failure() }}
+        run: cat /home/runner/.cpanm/work/*/build.log
+
+      - name: Test
+        run: |
+          prove -lv t
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index fbdaaa01..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-dist: jammy
-group: previous
-
-language: perl
-
-perl:
-    - "5.38"
-    - "5.34"
-    - "5.26"
-
-addons:
-  apt:
-    packages:
-      # From Zonemaster Engine installation instruction for Ubuntu
-    - autoconf
-    - automake
-    - build-essential
-    - cpanminus
-    - libclone-perl
-    - libdevel-checklib-perl
-    - libextutils-pkgconfig-perl
-    - libfile-sharedir-perl
-    - libfile-slurp-perl
-    - libidn2-dev
-    - libintl-perl
-    - libjson-pp-perl
-    - liblist-compare-perl
-    - liblist-moreutils-perl
-    - liblocale-msgfmt-perl
-    - libmail-rfc822-address-perl
-    - libmail-spf-perl
-    - libmodule-find-perl
-    - libnet-ip-perl
-    - libpod-coverage-perl
-    - libreadonly-xs-perl
-    - libssl-dev
-    - libtest-differences-perl
-    - libtest-exception-perl
-    - libtest-fatal-perl
-    - libtest-pod-perl
-    - libtext-csv-perl
-    - libtool
-    - m4
-      # From Zonemaster CLI installation instruction for Ubuntu
-    # libmodule-install-perl, see cpan-install below
-    - libtry-tiny-perl
-
-before_install:
-  # Help Perl find modules installed from OS packages
-- export PERL5LIB=/usr/share/perl5
-
-  # Provide cpanm helper
-  # quoting preserves newlines in the script and then avoid error if the script contains comments
-- eval "$(curl https://travis-perl.github.io/init)" --auto
-
-  # Zonemaster LDNS needs a newer version of Module::Install
-- cpan-install Module::Install Module::Install::XSUtil
-
-  # IO::Socket::INET6 can't find Socket6 installed from OS package
-- cpan-install Socket6 IO::Socket::INET6
-
-  # Install Zonemaster LDNS
-- git clone --depth=1 --branch=$TRAVIS_BRANCH https://github.com/zonemaster/zonemaster-ldns.git
-- ( cd zonemaster-ldns && cpanm --verbose --notest --configure-args="--no-ed25519" . ) && rm -rf zonemaster-ldns
-
-  # Install Zonemaster Engine
-- git clone --depth=1 --branch=$TRAVIS_BRANCH https://github.com/zonemaster/zonemaster-engine.git
-- ( cd zonemaster-engine && cpanm --verbose --notest . ) && rm -rf zonemaster-engine
-
-  # Fix Header files location issue
-- if [[ ! -e /usr/include/sys/ ]]; then sudo mkdir /usr/include/sys/; fi
-- if [[ ! -e /usr/include/bits/ && -e /usr/include/x86_64-linux-gnu/bits/ ]]; then sudo ln -s /usr/include/x86_64-linux-gnu/bits/ /usr/include/bits; fi
-- if [[ ! -e /usr/include/sys/socket.h ]]; then sudo ln -s /usr/include/bits/socket.h /usr/include/sys/socket.h; fi
diff --git a/Changes b/Changes
index d8edfb97..72d07c86 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,20 @@
 Release history for Zonemaster component Zonemaster-CLI
 
 
+v8.0.0 2025-06-26 (part of Zonemaster v2025.1 release)
+
+ [Breaking changes]
+- Makes the --test option more flexible #359
+
+ [Features]
+- Expands the --nstimes option #421
+- Expands the --count option #424
+
+ [Fixes]
+- Updates translations #444, #445
+- Slows down the spinner a bit #419
+
+
 v7.2.0 2025-03-04 (part of Zonemaster v2024.2.1 release)
 
  [Release information]
diff --git a/MANIFEST b/MANIFEST
index 9abca490..29e0fce7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -12,6 +12,7 @@ inc/Module/Install/Share.pm
 inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
 lib/Zonemaster/CLI.pm
+lib/Zonemaster/CLI/TestCaseSet.pm
 LICENSE
 Makefile.PL
 MANIFEST			This list of files
@@ -29,6 +30,7 @@ share/locale/sl/LC_MESSAGES/Zonemaster-CLI.mo
 share/locale/sv/LC_MESSAGES/Zonemaster-CLI.mo
 t/00-load.t
 t/pod.t
+t/test_case_set.t
 t/usage.fake-data.data
 t/usage.fake-root.data
 t/usage.hints
diff --git a/Makefile.PL b/Makefile.PL
index e51c32f2..75e3e39e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,8 +23,8 @@ requires(
     'JSON::XS'           => 0,
     'Locale::TextDomain' => 1.23,
     'Try::Tiny'          => 0,
-    'Zonemaster::LDNS'   => 4.001000,  # v4.1.0
-    'Zonemaster::Engine' => 7.001000,  # v7.1.0
+    'Zonemaster::LDNS'   => 5.000000,  # v5.0.0
+    'Zonemaster::Engine' => 8.000000,  # v8.0.0
 );
 
 test_requires(
diff --git a/lib/Zonemaster/CLI.pm b/lib/Zonemaster/CLI.pm
index 905c4ccd..02eaa608 100644
--- a/lib/Zonemaster/CLI.pm
+++ b/lib/Zonemaster/CLI.pm
@@ -1,18 +1,17 @@
 # Brief help module to define the exception we use for early exits.
 package Zonemaster::Engine::Exception::NormalExit;
-use 5.014002;
+use v5.26;
 use warnings;
 use parent 'Zonemaster::Engine::Exception';
 
 # The actual interesting module.
 package Zonemaster::CLI;
 
-use 5.014002;
+use v5.26;
 
-use strict;
 use warnings;
 
-use version; our $VERSION = version->declare( "v7.2.0" );
+use version; our $VERSION = version->declare( "v8.0.0" );
 
 use Locale::TextDomain 'Zonemaster-CLI';
 
@@ -26,15 +25,17 @@ use Pod::Usage;
 use POSIX qw[setlocale LC_MESSAGES LC_CTYPE];
 use Readonly;
 use Scalar::Util qw[blessed];
+use Time::HiRes;
 use Try::Tiny;
-use Zonemaster::LDNS;
-use Zonemaster::Engine;
+use Zonemaster::CLI::TestCaseSet;
 use Zonemaster::Engine::Exception;
-use Zonemaster::Engine::Normalization qw[normalize_name];
 use Zonemaster::Engine::Logger::Entry;
+use Zonemaster::Engine::Normalization qw[normalize_name];
 use Zonemaster::Engine::Translator;
-use Zonemaster::Engine::Util qw[parse_hints];
+use Zonemaster::Engine::Util       qw[parse_hints];
 use Zonemaster::Engine::Validation qw[validate_ipv4 validate_ipv6];
+use Zonemaster::Engine;
+use Zonemaster::LDNS;
 
 our %numeric = Zonemaster::Engine::Logger::Entry->levels;
 our $JSON    = JSON::XS->new->allow_blessed->convert_blessed->canonical;
@@ -141,10 +142,11 @@ sub run {
             'test=s'          => \@opt_test,
             'time!'           => \$opt_time,
             'version!'        => \$opt_version,
-        ) or do {
+          )
+          or do {
             my_pod2usage( verbosity => 0, output => \*STDERR );
             return 2;
-        };
+          };
     }
 
     if ( $opt_help ) {
@@ -167,17 +169,20 @@ sub run {
         $ENV{LC_ALL} = $opt_locale;
     }
 
-    # Set LC_MESSAGES and LC_CTYPE separately (https://www.gnu.org/software/gettext/manual/html_node/Triggering.html#Triggering)
+    # Set LC_MESSAGES and LC_CTYPE separately
+    # (https://www.gnu.org/software/gettext/manual/html_node/Triggering.html#Triggering)
     if ( not defined setlocale( LC_MESSAGES, "" ) ) {
-        my $locale = ($ENV{LANGUAGE} || $ENV{LC_ALL} || $ENV{LC_MESSAGES});
-        say STDERR __x( "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it installed on this system?\n\n",
-                        locale => $locale)
+        my $locale = ( $ENV{LANGUAGE} || $ENV{LC_ALL} || $ENV{LC_MESSAGES} );
+        say STDERR __x(
+            "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it installed on this system?",
+            locale => $locale ) . "\n\n";
     }
-    
+
     if ( not defined setlocale( LC_CTYPE, "" ) ) {
-        my $locale = ($ENV{LC_ALL} || $ENV{LC_CTYPE});
-        say STDERR __x( "Warning: setting locale category LC_CTYPE to {locale} failed -- is it installed on this system?\n\n",
-                       locale => $locale)
+        my $locale = ( $ENV{LC_ALL} || $ENV{LC_CTYPE} );
+        say STDERR __x(
+            "Warning: setting locale category LC_CTYPE to {locale} failed -- is it installed on this system?",
+            locale => $locale ) . "\n\n";
     }
 
     if ( $opt_version ) {
@@ -202,7 +207,8 @@ sub run {
 
     if ( defined $opt_json_translate ) {
         unless ( $opt_json or $opt_json_stream ) {
-            printf STDERR __( "Warning: --json-translate has no effect without either --json or --json-stream." ) . "\n";
+            printf STDERR __( "Warning: --json-translate has no effect without either --json or --json-stream." )
+              . "\n";
         }
         if ( $opt_json_translate ) {
             printf STDERR __( "Warning: deprecated --json-translate, use --no-raw instead." ) . "\n";
@@ -254,97 +260,27 @@ sub run {
         };
     }
 
-    my @testing_suite;
-    if ( @opt_test ) {
-        my %existing_tests = Zonemaster::Engine->all_methods;
-        my @existing_test_modules = keys %existing_tests;
-        my @existing_test_cases = map { @{ $existing_tests{$_} } } @existing_test_modules;
+    {
+        my %all_methods = Zonemaster::Engine->all_methods;
+        my $cases       = Zonemaster::CLI::TestCaseSet->new(    #
+            Zonemaster::Engine::Profile->effective->get( q{test_cases} ),
+            \%all_methods,
+        );
 
-        foreach my $t ( @opt_test ) {
-            # There should be at most one slash character
-            if ( $t =~ tr/\/// > 1 ) {
-                say STDERR __x( "Error: Invalid input '{cli_arg}' in --test. There must be at most one slash ('/') character.",
-                                cli_arg => $t);
-                return $EXIT_USAGE_ERROR;
-            }
+        for my $test ( @opt_test ) {
+            my @modifiers = Zonemaster::CLI::TestCaseSet->parse_modifier_expr( $test );
+            while ( @modifiers ) {
+                my $op   = shift @modifiers;
+                my $term = shift @modifiers;
 
-            # The case does not matter
-            $t = lc( $t );
-
-            my ( $module, $method );
-            # Fully qualified module and test case (e.g. Example/example12), or just a test case (e.g. example12). Note the different capturing order.
-            if ( ( ($module, $method) = $t =~ m#^ ( [a-z]+ ) / ( [a-z]+[0-9]{2} ) $#ix )
-                or
-                 ( ($method, $module) = $t =~ m#^ ( ( [a-z]+ ) [0-9]{2} ) $#ix ) )
-            {
-                # Check that test module exists
-                if ( grep( /^$module$/,  map { lc($_) } @existing_test_modules ) ) {
-                    # Check that test case exists
-                    if ( grep( /^$method$/, @existing_test_cases ) ) {
-                        push @testing_suite, "$module/$method";
-                    }
-                    else {
-                        say STDERR __x( "Error: Unrecognized test case '{testcase}' in --test. Use --list-tests for a list of valid choices.",
-                                        testcase => $method );
-                        return $EXIT_USAGE_ERROR;
-                    }
-                }
-                else {
-                    say STDERR __x( "Error: Unrecognized test module '{module}' in --test. Use --list-tests for a list of valid choices.",
-                                    module => $module );
-                    return $EXIT_USAGE_ERROR;
-                }
-            }
-            # Just a module name (e.g. Example) or something invalid.
-            else {
-                $t =~ s{/$}{};
-                # Check that test module exists
-                if ( grep( /^$t$/,  map { lc($_) } @existing_test_modules ) ) {
-                    push @testing_suite, $t;
-                }
-                else {
-                    say STDERR __x( "Error: Invalid input '{cli_arg}' in --test.",
-                                    cli_arg => $t);
+                if ( !$cases->apply_modifier( $op, $term ) ) {
+                    say STDERR __x( "Error: unrecognized term '{term}' in --test.", term => $term ) . "\n";
                     return $EXIT_USAGE_ERROR;
                 }
             }
         }
 
-        # Start with all profile-enabled test cases
-        my @actual_test_cases = @{ Zonemaster::Engine::Profile->effective->get( 'test_cases' ) };
-
-        # Derive test module from each profile-enabled test case
-        my %actual_test_modules;
-        foreach my $t ( @actual_test_cases ) {
-            my ( $module ) = $t =~ m#^ ( [a-z]+ ) [0-9]{2} $#ix;
-            $actual_test_modules{$module} = 1;
-        }
-
-        # Check if more test cases need to be included in the profile
-        foreach my $t ( @testing_suite ) {
-            # Either a module/method, or just a module
-            my ( $module, $method ) = split('/', $t);
-            if ( $method ) {
-                # Test case in not already in the profile, we add it explicitly and notify the user
-                if ( not grep( /^$method$/, @actual_test_cases ) ) {
-                    say $fh_diag __x( "Notice: Engine does not have test case '{testcase}' enabled in the profile. Forcing...",
-                        testcase => $method );
-                    push @actual_test_cases, $method;
-                }
-            }
-            else {
-                # No test case from this module is already in the profile, we can add them all
-                if ( not grep( /^$module$/, keys %actual_test_modules ) ) {
-                    # Get the test module with the right case
-                    ( $module ) = grep { lc( $module ) eq lc( $_ ) } @existing_test_modules;
-                    # No need to bother to check for duplicates here
-                    push @actual_test_cases, @{ $existing_tests{$module} };
-                }
-            }
-        }
-
-        # Configure Engine to include all of the required test cases in the profile
-        Zonemaster::Engine::Profile->effective->set( 'test_cases', [ uniq sort @actual_test_cases ] );
+        Zonemaster::Engine::Profile->effective->set( q{test_cases}, [ $cases->to_list ] ),
     }
 
     # These two must come after any profile from command line has been loaded
@@ -390,7 +326,7 @@ sub run {
         module   => 12,
         testcase => 14
     );
-    my %header_names = ();
+    my %header_names    = ();
     my %remaining_space = ();
 
     # Callback defined here so it closes over the setup above.
@@ -400,9 +336,11 @@ sub run {
 
         print_spinner() if $show_progress;
 
-        $counter{ uc $entry->level } += 1;
+        my $entry_level = $entry->level;
+
+        $counter{ uc $entry_level } += 1;
 
-        if ( $numeric{ uc $entry->level } >= $numeric{$opt_level} ) {
+        if ( $numeric{ uc $entry_level } >= $numeric{$opt_level} ) {
             $printed_something = 1;
 
             if ( $opt_json and $opt_json_stream ) {
@@ -412,8 +350,8 @@ sub run {
                 $r{module}    = $entry->module    if $opt_show_module;
                 $r{testcase}  = $entry->testcase  if $opt_show_testcase;
                 $r{tag}       = $entry->tag;
-                $r{level}     = $entry->level if $opt_show_level;
-                $r{args}      = $entry->args  if $entry->args;
+                $r{level}     = $entry_level if $opt_show_level;
+                $r{args}      = $entry->args if $entry->args;
                 $r{message}   = $translator->translate_tag( $entry ) unless $opt_raw;
 
                 say $JSON->encode( \%r );
@@ -424,29 +362,29 @@ sub run {
             else {
                 my $prefix = q{};
                 if ( $opt_time ) {
-                    $prefix .= sprintf "%*.2f ", ${field_width{seconds}}, $entry->timestamp;
+                    $prefix .= sprintf "%*.2f ", ${ field_width { seconds } }, $entry->timestamp;
                 }
 
                 if ( $opt_show_level ) {
                     $prefix .= $opt_raw ? $entry->level : translate_severity( $entry->level );
                     my $space_l10n =
-                        ${ field_width { level } } - length( decode_utf8( translate_severity( $entry->level ) ) ) + 1;
+                      ${ field_width { level } } - length( decode_utf8( translate_severity( $entry_level ) ) ) + 1;
                     $prefix .= ' ' x $space_l10n;
                 }
 
                 if ( $opt_show_module ) {
-                    $prefix .= sprintf "%-*s ", ${field_width{module}}, $entry->module;
+                    $prefix .= sprintf "%-*s ", ${ field_width { module } }, $entry->module;
                 }
 
                 if ( $opt_show_testcase ) {
-                    $prefix .= sprintf "%-*s ", ${field_width{testcase}}, $entry->testcase;
+                    $prefix .= sprintf "%-*s ", ${ field_width { testcase } }, $entry->testcase;
                 }
 
                 if ( $opt_raw ) {
                     $prefix .= $entry->tag;
 
                     my $message = $entry->argstr;
-                    my @lines = split /\n/, $message;
+                    my @lines   = split /\n/, $message;
 
                     printf "%s%s %s\n", $prefix, ' ', @lines ? shift @lines : '';
                     for my $line ( @lines ) {
@@ -454,8 +392,11 @@ sub run {
                     }
                 }
                 else {
-                    if ( $entry->level eq q{DEBUG3} and scalar( keys %{$entry->args} ) == 1 and defined $entry->args->{packet} ) {
-                        my $packet = $entry->args->{packet};
+                    if (    $entry_level eq q{DEBUG3}
+                        and scalar( keys %{ $entry->args } ) == 1
+                        and defined $entry->args->{packet} )
+                    {
+                        my $packet  = $entry->args->{packet};
                         my $padding = q{ } x length $prefix;
                         $entry->args->{packet} = q{};
                         printf "%s%s\n", $prefix, $translator->translate_tag( $entry );
@@ -467,10 +408,14 @@ sub run {
                         printf "%s%s\n", $prefix, $translator->translate_tag( $entry );
                     }
                 }
-            }
-        }
+            } ## end else [ if ( $opt_json and $opt_json_stream)]
+        } ## end if ( $numeric{ uc $entry_level...})
         if ( $opt_stop_level and $numeric{ uc $entry->level } >= $numeric{$opt_stop_level} ) {
-            die( Zonemaster::Engine::Exception::NormalExit->new( { message => "Saw message at level " . $entry->level } ) );
+            die(
+                Zonemaster::Engine::Exception::NormalExit->new(
+                    { message => "Saw message at level " . $entry->level }
+                )
+            );
         }
     };
 
@@ -484,7 +429,6 @@ sub run {
         }
     );
 
-
     if ( @argv > 1 ) {
         say STDERR __(
             "Only one domain can be given for testing. Did you forget to prepend an option with '--<OPTION>'?" );
@@ -542,7 +486,7 @@ sub run {
 
         Zonemaster::Engine::Recursor->remove_fake_addresses( '.' );
         Zonemaster::Engine::Recursor->add_fake_addresses( '.', $hints_data );
-    }
+    } ## end if ( defined $opt_hints)
 
     # This can generate early log messages.
     if ( @opt_ns ) {
@@ -615,39 +559,17 @@ sub run {
         $header .= sprintf "%s\n", "=" x $field_width{message};
 
         print $header;
-    }
+    } ## end if ( not $opt_raw and ...)
 
     # Now we are ready to actually print messages, including those that are
     # currently in the hold queue.
-    while (my $entry = pop @held_messages) {
-        $message_printer->($entry);
+    while ( my $entry = pop @held_messages ) {
+        $message_printer->( $entry );
     }
-    Zonemaster::Engine->logger->callback($message_printer);
+    Zonemaster::Engine->logger->callback( $message_printer );
 
     # Actually run tests!
-    eval {
-        if ( @opt_test ) {
-            foreach my $t ( @testing_suite ) {
-                # Either a module/method, or just a module
-                my ( $module, $method ) = split('/', $t);
-                if ( $method ) {
-                    Zonemaster::Engine->test_method( $module, $method, $domain );
-                }
-                else {
-                    Zonemaster::Engine->test_module( $module, $domain );
-                }
-            }
-        }
-        else {
-            Zonemaster::Engine->test_zone( $domain );
-        }
-    };
-
-    if ( not $opt_raw and not $opt_json ) {
-        if ( not $printed_something ) {
-            say __( "Looks OK." );
-        }
-    }
+    eval { Zonemaster::Engine->test_zone( $domain ); };
 
     if ( $@ ) {
         my $err = $@;
@@ -659,59 +581,161 @@ sub run {
         }
     }
 
+    if ( not $opt_raw and not $opt_json ) {
+        if ( not $printed_something ) {
+            say __( "Looks OK." );
+        }
+    }
+
     my $json_output = {};
 
     if ( $opt_count ) {
+        my %entries;
+        foreach my $e ( @{ Zonemaster::Engine->logger->entries } ) {
+            $entries{$e->level}{$e->tag} += 1;
+        }
+
         if ( $opt_json ) {
             $json_output->{count} = {};
             foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %counter ) {
-                $json_output->{count}{$level} = $counter{$level};
+                $json_output->{count}{by_level}{$level} = $counter{$level};
+            }
+
+            foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %entries ) {
+                foreach my $tag ( sort keys %{ $entries{$level} } ) {
+                    $json_output->{count}{by_message_tag}{$level}{$tag} = $entries{$level}{$tag};
+                }
             }
         }
         else {
-            say __( "\n\n   Level\tNumber of log entries" );
-            say "   =====\t=====================";
+            my $header1 = __( 'Level' );
+            my $max1 = length $header1;
+            my $header2 = __( 'Number of log entries' );
+            my $max2 = length $header2;
+
+            foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %counter ) {
+                my $len = length translate_severity( $level );
+                $max1 = $len if $len > $max1;
+            }
+
+            printf "\n\n%${max1}s\t%${max2}s", $header1, $header2;
+            printf "\n%s\t%s\n", '=' x $max1, '=' x $max2;
+
             foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %counter ) {
-                printf __( "%8s\t%5d entries.\n" ), translate_severity( $level ), $counter{$level};
+                printf "%${max1}s\t%${max2}d\n", translate_severity( $level ), $counter{$level};
+            }
+
+            my $header3 = __( 'Message tag' );
+            my $max3 = max map { length "$_" } ( ( map { keys %{ $_ } } ( values %entries ) ), $header3 );
+            my $header4 = __( 'Count' );
+            my $max4 = max map { length "$_" } ( ( map { values %{ $_ } } ( values %entries ) ), $header4 );
+
+            printf "\n%${max1}s\t%${max3}s\t%${max4}s", $header1, $header3, $header4;
+            printf "\n%${max1}s\t%${max3}s\t%${max4}s\n", '=' x $max1, '=' x $max3, '=' x $max4;
+            foreach my $level ( sort { $numeric{$b} <=> $numeric{$a} } keys %entries ) {
+                foreach my $tag ( sort keys %{ $entries{$level} } ) {
+                    printf "%${max1}s\t%${max3}s\t%${max4}s\n", $level, $tag, $entries{$level}{$tag};
+                }
             }
         }
     }
 
     if ( $opt_nstimes ) {
         my $zone = Zonemaster::Engine->zone( $domain );
-        my $max = max map { length( "$_" ) } ( @{ $zone->ns }, q{Server} );
+        my %all_nss = %{ Zonemaster::Engine::Nameserver::object_cache };
+        my @child_nss = @{ $zone->ns };
+        my @parent_nss = @{ $zone->parent->ns };
+        my @all_responded_nss;
+
+        foreach my $ns_name ( keys %all_nss ) {
+            foreach my $ns ( values %{ $all_nss{$ns_name} } ) {
+                push @all_responded_nss, $ns if scalar @{ $ns->times } > 0;
+            }
+        }
+
+        my %nss_filter = map { $_ => undef } ( @child_nss, @parent_nss );
+        my @other_nss = grep { ! exists $nss_filter{$_} } @all_responded_nss;
 
         if ( $opt_json ) {
-            my @times = ();
-            foreach my $ns ( @{ $zone->ns } ) {
-                push @times, {
-                    'ns'     => $ns->string,
-                    'max'    => 1000 * $ns->max_time,
-                    'min'    => 1000 * $ns->min_time,
-                    'avg'    => 1000 * $ns->average_time,
-                    'stddev' => 1000 * $ns->stddev_time,
-                    'median' => 1000 * $ns->median_time,
-                    'total'  => 1000 * $ns->sum_time
+            my @times;
+
+            my sub json_nstimes {
+                my ( $ns ) = @_;
+                return {
+                    'ns'      => $ns->string,
+                    'max'     => 1000 * $ns->max_time,
+                    'min'     => 1000 * $ns->min_time,
+                    'avg'     => 1000 * $ns->average_time,
+                    'stddev'  => 1000 * $ns->stddev_time,
+                    'median'  => 1000 * $ns->median_time,
+                    'total'   => 1000 * $ns->sum_time,
+                    'count'   => scalar @{ $ns->times }
                 };
             }
+
+            my %section_mapping = (
+                'child' => \@child_nss,
+                'parent' => \@parent_nss,
+                'other' => \@other_nss
+            );
+
+            foreach my $section_name ( sort keys %section_mapping ) {
+                my @entries = map { json_nstimes( $_ ) } sort @{ $section_mapping{$section_name} };
+                push @times, { $section_name => \@entries };
+            }
+
             $json_output->{nstimes} = \@times;
         }
         else {
-            print "\n";
-            printf "%${max}s %s\n", 'Server', '      Max      Min      Avg   Stddev   Median     Total';
-            printf "%${max}s %s\n", '=' x $max, ' ======== ======== ======== ======== ======== =========';
-
-            foreach my $ns ( @{ $zone->ns } ) {
-                printf "%${max}s ", $ns->string;
-                printf "%9.2f ",    1000 * $ns->max_time;
-                printf "%8.2f ",    1000 * $ns->min_time;
-                printf "%8.2f ",    1000 * $ns->average_time;
-                printf "%8.2f ",    1000 * $ns->stddev_time;
-                printf "%8.2f ",    1000 * $ns->median_time;
-                printf "%9.2f\n",   1000 * $ns->sum_time;
+            my $header = __( 'Name servers' );
+            my $max = max map { length( "$_" ) } ( ( @child_nss, @parent_nss, @all_responded_nss ), $header );
+            printf "\n%${max}s %s\n", $header, '        Max        Min        Avg     Stddev     Median       Total       Count';
+            printf "%${max}s %s\n", '=' x $max, ' ========== ========== ========== ========== ========== =========== ===========';
+
+            my $total_queries_count = 0;
+            my $total_queries_times = 0;
+            my %nss_already_processed;
+
+            my sub print_nstimes {
+                my ( $ns, $max, $total_queries_count, $total_queries_times, $nss_already_processed_ref ) = @_;
+                my %nss_already_processed = %{ $nss_already_processed_ref };
+
+                printf "%${max}s ",  $ns->string;
+                printf "%11.2f ",    1000 * $ns->max_time;
+                printf "%10.2f ",    1000 * $ns->min_time;
+                printf "%10.2f ",    1000 * $ns->average_time;
+                printf "%10.2f ",    1000 * $ns->stddev_time;
+                printf "%10.2f ",    1000 * $ns->median_time;
+                printf "%11.2f ",    1000 * $ns->sum_time;
+                printf "%11d\n",     scalar @{ $ns->times };
+                $total_queries_count += scalar @{ $ns->times } unless $nss_already_processed{$ns};
+                $total_queries_times += ( 1000 * $ns->sum_time ) unless $nss_already_processed{$ns};
+
+                return $total_queries_count, $total_queries_times;
             }
+
+            my %section_mapping = (
+                1 => { __( 'Child zone' ) => \@child_nss },
+                2 => { __( 'Parent zone' ) => \@parent_nss },
+                3 => { __( 'Other' ) => \@other_nss }
+            );
+
+            foreach my $section_order ( sort keys %section_mapping ) {
+                foreach my $section_header ( keys % { $section_mapping{$section_order} } ) {
+                    printf "%s %s\n", $section_header, '-' x ( ( $max - length $section_header ) - 1 );
+
+                    foreach my $section_nss ( sort @{ $section_mapping{$section_order}{$section_header} } ) {
+                        ( $total_queries_count, $total_queries_times ) =
+                            print_nstimes( $section_nss, $max, $total_queries_count, $total_queries_times, \%nss_already_processed );
+                        $nss_already_processed{$section_nss} = 1;
+                    }
+                }
+            }
+
+            printf "%${max}s %s\n", '=' x $max, ' ========== ========== ========== ========== ========== =========== ===========';
+            printf "%${max}s %67.2f %11s\n", __( 'Grand total' ), $total_queries_times, $total_queries_count;
         }
-    }
+    } ## end if ( $opt_nstimes )
 
     if ( $opt_elapsed ) {
         my $last = Zonemaster::Engine->logger->entries->[-1];
@@ -720,7 +744,7 @@ sub run {
             $json_output->{elapsed} = $last->timestamp;
         }
         else {
-            printf "Total test run time: %0.1f seconds.\n", $last->timestamp;
+            printf "\nTotal test run time: %0.1f seconds.\n", $last->timestamp;
         }
     }
 
@@ -729,7 +753,7 @@ sub run {
         $res = $JSON->decode( $res );
         foreach ( @$res ) {
             unless ( $opt_raw ) {
-                my %e = %$_;
+                my %e     = %$_;
                 my $entry = Zonemaster::Engine::Logger::Entry->new( \%e );
                 $_->{message} = $translator->translate_tag( $entry );
             }
@@ -750,7 +774,7 @@ sub run {
     }
 
     return $EXIT_SUCCESS;
-}
+} ## end sub run
 
 sub check_fake_delegation {
     my ( $domain, @ns ) = @_;
@@ -765,7 +789,7 @@ sub check_fake_delegation {
         ( my $errors, $name ) = normalize_name( decode( 'utf8', $name ) );
 
         if ( scalar @$errors > 0 ) {
-            my $error_message = "Invalid name in --ns argument:\n" ;
+            my $error_message = "Invalid name in --ns argument:\n";
             foreach my $err ( @$errors ) {
                 $error_message .= "\t" . $err->string . "\n";
             }
@@ -774,22 +798,25 @@ sub check_fake_delegation {
 
         if ( $ip ) {
             my $net_ip = Net::IP::XS->new( $ip );
-	    unless( validate_ipv4( $ip ) or validate_ipv6( $ip ) )
-	    {
-                die Net::IP::XS::Error() ? "Invalid IP address in --ns argument:\n\t". Net::IP::XS::Error() ."\n" : "Invalid IP address in --ns argument.\n";
+            unless ( validate_ipv4( $ip ) or validate_ipv6( $ip ) ) {
+                die Net::IP::XS::Error()
+                  ? "Invalid IP address in --ns argument:\n\t" . Net::IP::XS::Error() . "\n"
+                  : "Invalid IP address in --ns argument.\n";
             }
         }
-    }
+    } ## end foreach my $pair ( @ns )
 
     return;
-}
+} ## end sub check_fake_delegation
 
 sub check_fake_ds {
     my ( @ds ) = @_;
 
     foreach my $str ( @ds ) {
         unless ( $str =~ /$DS_RE/ ) {
-            say STDERR __( "--ds ds data must be in the form \"keytag,algorithm,type,digest\". E.g. space is not permitted anywhere in the string.");
+            say STDERR __(
+"--ds ds data must be in the form \"keytag,algorithm,type,digest\". E.g. space is not permitted anywhere in the string."
+            );
             exit( 1 );
         }
     }
@@ -808,7 +835,7 @@ sub add_fake_delegation {
         ( my $errors, $name ) = normalize_name( decode( 'utf8', $name ) );
 
         if ( $ip ) {
-            push @{ $data{ $name } }, $ip;
+            push @{ $data{$name} }, $ip;
         }
         else {
             push @ns_with_no_ip, $name;
@@ -816,14 +843,14 @@ sub add_fake_delegation {
     }
 
     foreach my $ns ( @ns_with_no_ip ) {
-        if ( not exists $data{ $ns } ) {
-            $data{ $ns } = undef;
+        if ( not exists $data{$ns} ) {
+            $data{$ns} = undef;
         }
     }
 
     return Zonemaster::Engine->add_fake_delegation( $domain => \%data );
 
-}
+} ## end sub add_fake_delegation
 
 sub add_fake_ds {
     my ( $domain, @ds ) = @_;
@@ -851,11 +878,14 @@ sub print_versions {
 my @spinner_strings = ( '  | ', '  / ', '  - ', '  \\ ' );
 
 sub print_spinner {
-    state $counter = 0;
-
-    printf "%s\r", $spinner_strings[ $counter++ % 4 ];
+    state $counter   = 0;
+    state $last_spin = [ 0, 0 ];
 
-    return;
+    my $time = [ Time::HiRes::gettimeofday() ];
+    if ( Time::HiRes::tv_interval( $last_spin, $time ) > 0.1 ) {
+        $last_spin = $time;
+        printf "%s\r", $spinner_strings[ $counter++ % 4 ];
+    }
 }
 
 sub print_test_list {
@@ -879,7 +909,7 @@ sub print_test_list {
 sub do_dump_profile {
     my $json = JSON::XS->new->canonical->pretty;
 
-    print $json->encode( Zonemaster::Engine::Profile->effective->{ q{profile} } );
+    print $json->encode( Zonemaster::Engine::Profile->effective->{q{profile}} );
 
     return;
 }
@@ -907,13 +937,13 @@ sub translate_severity {
     else {
         return $severity;
     }
-}
+} ## end sub translate_severity
 
 sub _max {
     my ( $a, $b ) = @_;
     $a //= 0;
     $b //= 0;
-    return ( $a > $b ? $a : $b ) ;
+    return ( $a > $b ? $a : $b );
 }
 
 1;
diff --git a/lib/Zonemaster/CLI/TestCaseSet.pm b/lib/Zonemaster/CLI/TestCaseSet.pm
new file mode 100644
index 00000000..937589e3
--- /dev/null
+++ b/lib/Zonemaster/CLI/TestCaseSet.pm
@@ -0,0 +1,271 @@
+package Zonemaster::CLI::TestCaseSet;
+use 5.014;
+use warnings;
+use utf8;
+
+use Carp qw( croak );
+
+=head1 NAME
+
+    Zonemaster::CLI::TestCaseSet - Manage and modify Zonemaster test case selections
+
+=head1 SYNOPSIS
+
+    use Zonemaster::CLI::TestCaseSet;
+
+    # Define the names of the available test modules and their test cases
+    my $schema = {
+        alpha => [qw( alpha01 alpha02 alpha03 )],
+        beta  => [qw( beta01 beta02 )],
+    };
+
+    # Construct an initial selection of test cases
+    my $selection = Zonemaster::CLI::TestCaseSet->new(
+        [qw( alpha01 alpha02 alpha03 beta01 )],
+        $schema,
+    );
+
+    # Parse and apply a modifier expression
+    my @modifiers = Zonemaster::CLI::TestCaseSet->parse_modifier_expr( '-alpha+alpha02' );
+    while ( @modifiers ) {
+        my ( $op, $term ) = splice @modifiers, 0, 2;
+        $selection->apply_modifier( $op, $term )
+          or die "Error: Unrecognized term '$term'.\n";
+    }
+
+    # Output final test case selection
+    print join( ' ', $selection->to_list );    # alpha02 beta01
+
+=head1 DESCRIPTION
+
+Zonemaster::CLI::TestCaseSet represents a mutable selection of test cases,
+together with an immutable schema defining available test modules and their
+associated test cases.
+
+The schema is defined as a mapping of test module names to their associated test
+case names.
+
+The selection can be adjusted using modifier expressions.
+
+=head2 MODIFIER EXPRESSIONS
+
+A modifier expression describes a change to the current selection.
+Expressions combine terms using operators, e.g., C<'-alpha+alpha02'>.
+
+These operators are supported:
+
+=over 4
+
+=item C<'+'> (union)
+
+Add test cases to the current selection.
+The set of test cases to add is the expansion of C<$term>.
+
+=item C<'-'> (difference)
+
+Remove test cases from the current selection.
+The set of test cases to remove is the expansion of C<$term>.
+
+=item C<''> (replace)
+
+Replace the current selection.
+The new selection is the set of test cases expanded from C<$term>.
+
+=back
+
+Terms expand into sets of test cases in one of three ways:
+
+=over 4
+
+=item C<all>
+
+Expands to all available test cases defined by the schema.
+
+=item Test module name
+
+Expands to all test cases associated with the test module.
+
+=item Test case name
+
+Expands directly to the specified test case itself.
+Test cases may be specified plainly (e.g., C<Case10>) or fully qualified
+(module/testcase, e.g., C<Case/Case10>).
+
+=back
+
+Term matching is case-insensitive.
+
+=cut
+
+=head1 CONSTRUCTORS
+
+=head2 new( $selection, $schema )
+
+Construct a new TestCaseSet object.
+
+=over 4
+
+=item C<$selection> (arrayref)
+
+Initial selection of test case names.
+
+=item C<$schema> (hashref)
+
+A hash mapping test module names to arrays of their associated test case names.
+
+=back
+
+Dies if:
+- Any test case name in C<$schema> is repeated.
+- C<$selection> contains names not found in C<$schema>.
+
+=cut
+
+sub new {
+    my ( $class, $selection, $schema ) = @_;
+
+    my %cases = map { lc $_ => 1 } map { @{$_} } values %$schema;
+    for my $case ( @$selection ) {
+        if ( !exists $cases{ lc $case } ) {
+            croak "Unrecognized initial test case '$case'";
+        }
+    }
+
+    my $obj = {
+        _selection => { map { lc $_ => 1 } @$selection },
+        _terms     => _get_schema_terms( $schema ),
+    };
+
+    bless $obj, $class;
+
+    return $obj;
+}
+
+=head1 CLASS METHODS
+
+parse_modifier_expr( $modifier_expr )
+
+Parse a string containing a modifier expression and returns a list of
+alternating operators and terms.
+
+The returned list always starts with an operator.
+
+For example, parsing C<'-alpha+beta02'> returns:
+
+    ('-', 'alpha', '+', 'beta02')
+
+=cut
+
+sub parse_modifier_expr {
+    my ( $class, $modifier_expr ) = @_;
+
+    my @modifiers;
+    for my $op_and_term ( split /(?=[+-])/, $modifier_expr ) {
+        $op_and_term =~ /([+-]?)(.*)/;
+        my ( $op, $term ) = ( $1, $2 );
+
+        push @modifiers, ( $op, $term );
+    }
+
+    return @modifiers;
+}
+
+=head1 INSTANCE METHODS
+
+=head2 apply_modifier( $operator, $term )
+
+Update the selection using the given operator and term.
+
+Returns true if successful, or false if the term could not be expanded based on
+the schema.
+
+Dies if the operator is invalid.
+
+=head3 Example:
+
+    $selection->apply_modifier('+', 'beta') 
+        or die "Unrecognized term";
+
+=cut
+
+sub apply_modifier {
+    my ( $self, $op, $term ) = @_;
+
+    my $cases_ref = $self->{_terms}{ lc $term };
+
+    if ( !defined $cases_ref ) {
+        return 0;
+    }
+
+    if ( $op eq '' ) {
+        $self->{_selection} = {};
+        $op = '+';
+    }
+
+    if ( $op eq '-' ) {
+        for my $case ( @$cases_ref ) {
+            delete $self->{_selection}{$case};
+        }
+    }
+    elsif ( $op eq '+' ) {
+        for my $case ( @$cases_ref ) {
+            $self->{_selection}{$case} = 1;
+        }
+    }
+    else {
+        croak "Unrecognized operator '$op'";
+    }
+
+    return 1;
+} ## end sub apply_modifier
+
+=head2 to_list
+
+Return a lowercase list of the currently selected test case names.
+
+=cut
+
+sub to_list {
+    my ( $self ) = @_;
+
+    return sort keys %{ $self->{_selection} };
+}
+
+sub _get_schema_terms {
+    my ( $schema ) = @_;
+
+    my $terms = {};
+    $terms->{all} = [];
+
+    for my $module ( keys %$schema ) {
+        if ( lc $module eq 'all' ) {
+            croak "test module name must not be 'all'";
+        }
+        if ( $module =~ qr{/} ) {
+            croak "test module name contains forbidden character '/': '$module'";
+        }
+        if ( exists $terms->{ lc $module } ) {
+            croak "found test module with same name as another test case or test module: '$module'";
+        }
+        $terms->{ lc $module } = [];
+        for my $case ( @{ $schema->{$module} } ) {
+            if ( lc $case eq 'all' ) {
+                croak "test case name must not be 'all'";
+            }
+            if ( $case =~ qr{/} ) {
+                croak "test case name contains forbidden character '/': '$case'";
+            }
+            if ( exists $terms->{ lc $case } ) {
+                croak "found test case with same name as another test case or test module: '$case'";
+            }
+            $terms->{ lc $case } = [$case];
+            $terms->{ lc "$module/$case" } = [$case];
+            push @{ $terms->{ lc $module } }, $case;
+            push @{ $terms->{all} },          $case;
+        }
+    } ## end for my $module ( keys %$schema)
+
+    return $terms;
+} ## end sub _get_schema_terms
+
+1;
diff --git a/script/zonemaster-cli b/script/zonemaster-cli
index 0cfd7cc0..3142dc50 100755
--- a/script/zonemaster-cli
+++ b/script/zonemaster-cli
@@ -9,37 +9,34 @@ use autodie;
 
 sub read_conf_file {
     # Returns list of command line parameters. List can be empty.
-    my ($conf_file) = @_;
+    my ( $conf_file ) = @_;
     my @lines;
     open my $fh, '<', $conf_file;
-    while (<$fh>) {
+    while ( <$fh> ) {
         chomp;
         next if /^\s*$/;
         next if /^\s*#/;
         push @lines, $_;
-    };
+    }
     return @lines;
 }
 
 # Load default arguments from file in home directory, if any
 # This must be loaded before any global file to make the local
 # file take precedence
-my $home_dir  = ((getpwuid($<))[7]) || $ENV{HOME};
-my $home_conf_file = File::Spec->catfile($home_dir, '.zonemaster', 'cli.args');
+my $home_dir       = ( ( getpwuid( $< ) )[7] ) || $ENV{HOME};
+my $home_conf_file = File::Spec->catfile( $home_dir, '.zonemaster', 'cli.args' );
 
-if (-r $home_conf_file) {
-    my @lines = read_conf_file ($home_conf_file);
+if ( -r $home_conf_file ) {
+    my @lines = read_conf_file( $home_conf_file );
     unshift @ARGV, @lines;
 }
 
 # Load default arguments from global file, if any
-my @global_conf = (
-    '/etc/zonemaster/cli.args',
-    '/usr/local/etc/zonemaster/cli.args'
-    ); # Order is significant.
+my @global_conf = ( '/etc/zonemaster/cli.args', '/usr/local/etc/zonemaster/cli.args' );    # Order is significant.
 my $global_conf_file;
 
-for my $p (@global_conf) {
+for my $p ( @global_conf ) {
     if ( -e $p and -r $p ) {
         $global_conf_file = $p;
         last;
@@ -47,7 +44,7 @@ for my $p (@global_conf) {
 }
 
 if ( defined $global_conf_file ) {
-    my @lines = read_conf_file ($global_conf_file);
+    my @lines = read_conf_file( $global_conf_file );
     unshift @ARGV, @lines;
 
 }
@@ -111,17 +108,67 @@ Print the effective profile used in JSON format, then exit.
 
 =over 4
 
-=item B<--test>=TESTCASE, B<--test>=TESTMODULE
+=item B<--test>=EXPR
+
+Specify which test cases to run by setting the C<test_cases> property in the profile.
+The EXPR is a flexible expression consisting of terms (individual test cases, test
+modules, or all) and operators (C<+> to add, C<-> to remove).
+For details, see C<man zonemaster-cli>.
+
+=begin :man
+
+An EXPR starting with a term (e.g., C<all>, C<nameserver01>) I<replaces>
+the current selection.
+An EXPR starting with an operator (C<+> or C<->) I<modifies> the current selection.
+An empty EXPR (C<--test=>) does not modify the selection (i.e., it is a no-op).
+
+Multiple C<--test> options may be specified; they are applied in the order they are given.
+When used together with the C<--profile>, the profile option is applied first.
+
+Use C<--list-tests> to list all test cases and test modules in the default profile.
+
+Examples:
+
+=over 4
+
+=item --test=B<all>
+
+selects all test cases in the default profile, i.e. overrides any custom profile.
+
+=item --test=B<nameserver>
+
+selects all test cases in the Nameserver test module in the default profile.
 
-Limit the testing suite to run only the specified tests.
-Can be specified multiple times.
-(default: all test cases)
+=item --test=B<nameserver01>
 
-=for :man This can be the name of a testing module, in which case all test cases from
-that module will be run, or the name of a module followed by a slash and the
-name of a test case (test case identifier) in that module, or the name of the
-test case.
-This option is case-insensitive.
+selects only the Nameserver01 test case.
+
+=item --test=B<dnssec-dnssec05>
+
+selects all DNSSEC test cases except DNSSEC05.
+
+=item --test=B<all-nameserver+nameserver03>
+
+selects all test cases, excludes the Nameserver test cases, and adds back
+Nameserver03.
+
+=item --test=B<-dnssec>
+
+removes all DNSSEC test cases from the selection.
+
+=item --test=B<+syntax01+syntax02>
+
+adds the Syntax01 and Syntax02 test cases to the selection.
+
+=item --test=
+
+empty value is valid, but does not change the selection of test cases
+Specifying C<--test=> without an argument is a no-op.
+Having this possibility may come in handy when invoking zonemaster-cli from scripts.
+
+=back
+
+=end :man
 
 =item B<--level>=LEVEL
 
@@ -250,13 +297,14 @@ Print the name of the test case (test case identifier) which produced the messag
 =item B<--[no-]count>
 
 Print a summary, at the end of a run, of the numbers of messages for each severity
-level that were logged during the run.
+level that were logged during the run, as well as a count of each message tag.
 (default: disabled)
 
 =item B<--[no-]nstimes>
 
-Print a summary, at the end of a run, of the times (in milliseconds) the zone's
-name servers took to answer.
+Print a summary, at the end of a run, of various metrics related to the times
+(in milliseconds) each name server took to answer, as well as a count of the
+number of sent queries per name server.
 (default: disabled)
 
 =item B<--[no-]elapsed>
diff --git a/share/da.po b/share/da.po
index 262431c8..83b55dd3 100644
--- a/share/da.po
+++ b/share/da.po
@@ -15,22 +15,18 @@ msgstr ""
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Advarsel: Kunne ikke sætte locale kategori LC_MESSAGES til {locale} (er det "
-"installeret på dette system?).\n"
-"\n"
+"installeret på dette system?)."
 
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_CTYPE to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Advarsel: Kunne ikke sætte locale kategori LC_CTYPE til {locale} (er det "
-"installeret på dette system?).\n"
-"\n"
+"installeret på dette system?)."
 
 msgid "Warning: deprecated --encoding, simply remove it from your usage."
 msgstr "Advarsel: --encoding er forældet, fjern det blot fra din brug."
diff --git a/share/es.po b/share/es.po
index 73377413..9dd509b7 100644
--- a/share/es.po
+++ b/share/es.po
@@ -15,22 +15,18 @@ msgstr ""
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Advertencia: fallo en definir la categoría de localización LC_MESSAGES como "
-"{locale} (¿está instalada en este sistema?)\n"
-"\n"
+"{locale} (¿está instalada en este sistema?)"
 
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_CTYPE to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Advertencia: fallo en definir la categoría de localización LC_CTYPE como "
-"{locale} (¿está instalada en este sistema?)\n"
-"\n"
+"{locale} (¿está instalada en este sistema?)"
 
 msgid "Warning: deprecated --encoding, simply remove it from your usage."
 msgstr ""
diff --git a/share/fi.po b/share/fi.po
index 820ecdbe..5b5d22b6 100644
--- a/share/fi.po
+++ b/share/fi.po
@@ -182,22 +182,18 @@ msgstr "Tulosta kulunut aika (sekunteina) ajon lopussa."
 #, perl-format
 msgid ""
 "Warning: setting locale category LC_MESSAGES to %s failed (is it installed "
-"on this system?).\n"
-"\n"
+"on this system?)."
 msgstr ""
 "Varoitus: arvoa %s ei voitu asettaa lokaalikategorian LC_MESSAGES arvoksi "
-"(onko sitä asennettu tähän järjestelmään?).\n"
-"\n"
+"(onko sitä asennettu tähän järjestelmään?)."
 
 #, perl-format
 msgid ""
 "Warning: setting locale category LC_CTYPE to %s failed (is it installed on "
-"this system?).\n"
-"\n"
+"this system?)."
 msgstr ""
 "Varoitus: arvoa %s ei voitu asettaa lokaalikategorian LC_CTYPE arvoksi (onko "
-"sitä asennettu tähän järjestelmään?).\n"
-"\n"
+"sitä asennettu tähän järjestelmään?)."
 
 msgid ""
 "Error: --sourceaddr can't be combined with --sourceaddr4 or --sourceaddr6."
diff --git a/share/fr.po b/share/fr.po
index 4bc8d90d..a013112b 100644
--- a/share/fr.po
+++ b/share/fr.po
@@ -2,34 +2,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-18 10:20+0100\n"
-"PO-Revision-Date: 2023-05-22 07:44+0200\n"
+"POT-Creation-Date: 2025-06-24 13:54+0200\n"
+"PO-Revision-Date: 2025-06-24 14:00+0200\n"
 "Last-Translator: thomas.green@afnic.fr\n"
 "Language-Team: Zonemaster Team\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.6\n"
 
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Attention : positionner la catégorie de localisation LC_MESSAGES pour "
-"{locale} a échoué -- est-elle installée sur ce système ?\n"
-"\n"
+"{locale} a échoué -- est-elle installée sur ce système ?"
 
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_CTYPE to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Attention : positionner la catégorie de localisation LC_TYPE pour {locale} a "
-"échoué -- est-elle installée sur ce système ?\n"
-"\n"
+"échoué -- est-elle installée sur ce système ?"
 
 msgid "Warning: deprecated --encoding, simply remove it from your usage."
 msgstr ""
@@ -69,40 +66,8 @@ msgid "Error: invalid value for --sourceaddr6: {reason}"
 msgstr "Erreur : valeur incorrecte pour --sourceaddr6: {reason}"
 
 #, perl-brace-format
-msgid ""
-"Error: Invalid input '{cli_arg}' in --test. There must be at most one slash "
-"('/') character."
-msgstr ""
-"Erreur : Saisie incorrecte '{cli_arg}' pour --test. Il doit y avoir au plus "
-"un caractère slash ('/')."
-
-#, perl-brace-format
-msgid ""
-"Error: Unrecognized test case '{testcase}' in --test. Use --list-tests for a "
-"list of valid choices."
-msgstr ""
-"Erreur : Cas de test '{testcase}' non reconnu pour --test. Utiliser --list-"
-"tests pour voir la liste de choix valables."
-
-#, perl-brace-format
-msgid ""
-"Error: Unrecognized test module '{module}' in --test. Use --list-tests for a "
-"list of valid choices."
-msgstr ""
-"Erreur : Module de test '{module}' non reconnu pour --test. Utiliser --list-"
-"tests pour voir la liste de choix valables."
-
-#, perl-brace-format
-msgid "Error: Invalid input '{cli_arg}' in --test."
-msgstr "Erreur : Saisie '{cli_arg}' incorrecte pour --test."
-
-#, perl-brace-format
-msgid ""
-"Notice: Engine does not have test case '{testcase}' enabled in the profile. "
-"Forcing..."
-msgstr ""
-"Note : Engine n'a pas le cas de test '{testcase}' activé dans le profil. "
-"Activation..."
+msgid "Error: unrecognized term '{term}' in --test."
+msgstr "Erreur : terme non reconnu '{term}' pour --test."
 
 #, perl-brace-format
 msgid "Failed to recognize stop level '{level}'."
@@ -147,18 +112,29 @@ msgstr "Message"
 msgid "Looks OK."
 msgstr "Rien de particulier à signaler."
 
-msgid ""
-"\n"
-"\n"
-"   Level\tNumber of log entries"
-msgstr ""
-"\n"
-"\n"
-"   Niveau\tNombre d'entrées journal"
+msgid "Number of log entries"
+msgstr "Nombre d'entrées journal"
+
+msgid "Message tag"
+msgstr "Message"
+
+msgid "Count"
+msgstr "Compte"
+
+msgid "Name servers"
+msgstr "Serveurs de nom"
+
+msgid "Child zone"
+msgstr "Zone fille"
+
+msgid "Parent zone"
+msgstr "Zone parente"
+
+msgid "Other"
+msgstr "Autre"
 
-#, perl-format
-msgid "%8s\t%5d entries.\n"
-msgstr "%8s\t%5d entrées.\n"
+msgid "Grand total"
+msgstr "Grand total"
 
 msgid "--ns must be a name or a name/ip pair."
 msgstr "--ns doit être un nom ou un couple nom/ip."
diff --git a/share/nb.po b/share/nb.po
index 8d5c061e..95765bc9 100644
--- a/share/nb.po
+++ b/share/nb.po
@@ -171,22 +171,18 @@ msgstr "Skriv ut medgått tid (i sekunder) ved slutten av kjøringen."
 #, perl-format
 msgid ""
 "Warning: setting locale category LC_MESSAGES to %s failed (is it installed "
-"on this system?).\n"
-"\n"
+"on this system?)."
 msgstr ""
 "Advarsel: misslyktes med at sette locale category LC_MESSAGES til %s. Er den "
-"installert på dette system?\n"
-"\n"
+"installert på dette system?"
 
 #, perl-format
 msgid ""
 "Warning: setting locale category LC_CTYPE to %s failed (is it installed on "
-"this system?).\n"
-"\n"
+"this system?)."
 msgstr ""
 "Advarsel: misslyktes med at sette locale category LC_CTYPE til %s. Er den "
-"installert på dette system?\n"
-"\n"
+"installert på dette system?"
 
 msgid ""
 "Error: --sourceaddr can't be combined with --sourceaddr4 or --sourceaddr6."
diff --git a/share/sl.po b/share/sl.po
index 1d7946d5..9cce2871 100644
--- a/share/sl.po
+++ b/share/sl.po
@@ -15,22 +15,18 @@ msgstr ""
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Opozorilo: Neuspešno nastavljanje jezika {locale} za LC_MESSAGES(Je jezik "
-"nameščen na sistemu?).\n"
-"\n"
+"nameščen na sistemu?)."
 
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_CTYPE to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Opozorilo: Neuspešno nastavljanje jezika {locale} za LC_CTYPE (Je jezik "
-"nameščen na sistemu?).\n"
-"\n"
+"nameščen na sistemu?)."
 
 msgid "Warning: deprecated --encoding, simply remove it from your usage."
 msgstr ""
diff --git a/share/sv.po b/share/sv.po
index 008bcdd8..df3dd1f0 100644
--- a/share/sv.po
+++ b/share/sv.po
@@ -14,22 +14,18 @@ msgstr ""
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Varning: misslyckades med att sätta locale kategori LC_MESSAGES till "
-"'{locale}' – finns den installerad på det här systemet?\n"
-"\n"
+"'{locale}' – finns den installerad på det här systemet?"
 
 #, perl-brace-format
 msgid ""
 "Warning: setting locale category LC_CTYPE to {locale} failed -- is it "
-"installed on this system?\n"
-"\n"
+"installed on this system?"
 msgstr ""
 "Varning: misslyckades med att sätta locale kategori LC_CTYPE till '{locale}' "
-"– finns den installerad på det här systemet?\n"
-"\n"
+"– finns den installerad på det här systemet?"
 
 msgid "Warning: deprecated --encoding, simply remove it from your usage."
 msgstr ""
diff --git a/t/test_case_set.t b/t/test_case_set.t
new file mode 100644
index 00000000..d79e68da
--- /dev/null
+++ b/t/test_case_set.t
@@ -0,0 +1,320 @@
+#!perl
+use 5.14.2;
+use utf8;
+use warnings;
+use Test::More;
+
+use Log::Any::Test;
+use Log::Any qw( $log );
+use Test::Differences;
+use Test::Exception;
+use Zonemaster::Engine;
+use Zonemaster::Engine::Profile;
+
+use Zonemaster::CLI::TestCaseSet;
+
+require Test::NoWarnings;
+
+lives_ok {    # Make sure we get to print log messages in case of errors.
+    subtest 'parse_modifier_expr' => sub {
+        my @cases = (
+            {
+                name     => 'empty',
+                expr     => '',
+                expected => [],
+            },
+            {
+                name     => 'absolute term',
+                expr     => 'term',
+                expected => [ '', 'term' ],
+            },
+            {
+                name     => 'absolute additive',
+                expr     => 'term',
+                expected => [ '', 'term' ],
+            },
+            {
+                name     => 'absolute subtractive',
+                expr     => 'term',
+                expected => [ '', 'term' ],
+            },
+            {
+                name     => 'absolute multiple modifiers',
+                expr     => 'term1+term2',
+                expected => [ '', 'term1', '+', 'term2' ],
+            },
+            {
+                name     => 'relative multiple modifiers',
+                expr     => '-term1+term2',
+                expected => [ '-', 'term1', '+', 'term2' ],
+            },
+        );
+        for my $case ( @cases ) {
+            subtest $case->{name} => sub {
+                my @actual = Zonemaster::CLI::TestCaseSet->parse_modifier_expr( $case->{expr} );
+                eq_or_diff \@actual, $case->{expected};
+            };
+        }
+    };
+
+    subtest 'new' => sub {
+        my @cases = (
+            {
+                name      => 'empty',
+                schema    => {},
+                selection => [],
+                expect_ok => {
+                    terms   => ['all'],
+                    methods => [],
+                },
+            },
+            {
+                name      => 'multiple test modules and test cases',
+                schema    => { 'alpha' => [ 'bravo', 'charlie' ], 'delta' => ['echo'] },
+                selection => [ 'bravo', 'echo' ],
+                expect_ok => {
+                    terms => [
+                        'all',   'alpha',   'alpha/bravo', 'alpha/charlie',
+                        'bravo', 'charlie', 'delta',       'delta/echo',
+                        'echo'
+                    ],
+                    methods => [ 'bravo', 'echo' ],
+                },
+            },
+            {
+                name      => 'mixed cases',
+                schema    => { 'alpha' => [ 'BRAVO', 'charlie' ] },
+                selection => [ 'bravo', 'CHARLIE' ],
+                expect_ok => {
+                    terms   => [ 'all',   'alpha', 'alpha/bravo', 'alpha/charlie', 'bravo', 'charlie' ],
+                    methods => [ 'bravo', 'charlie' ],
+                },
+            },
+            {
+                name       => 'illegal test module name 1',
+                schema     => { 'all' => [] },
+                selection  => [],
+                expect_err => qr/must not be 'all'/i,
+            },
+            {
+                name       => 'illegal test module name 2',
+                schema     => { 'ALL' => [] },
+                selection  => [],
+                expect_err => qr/must not be 'all'/i,
+            },
+            {
+                name       => 'illegal test module name 3',
+                schema     => { 'alpha/bravo' => [] },
+                selection  => [],
+                expect_err => qr{contains forbidden character '/'}i,
+            },
+            {
+                name       => 'illegal test case name 1',
+                schema     => { 'alpha' => ['all'] },
+                selection  => [],
+                expect_err => qr/must not be 'all'/i,
+            },
+            {
+                name       => 'illegal test case name 2',
+                schema     => { 'alpha' => ['ALL'] },
+                selection  => [],
+                expect_err => qr/must not be 'all'/i,
+            },
+            {
+                name       => 'illegal test case name 3',
+                schema     => { 'alpha' => ['bravo/charlie'] },
+                selection  => [],
+                expect_err => qr{contains forbidden character '/'}i,
+            },
+            {
+                name       => 'duplicate term 1',
+                schema     => { 'alpha' => ['alpha'] },
+                selection  => [],
+                expect_err => qr/same name/i,
+            },
+            {
+                name       => 'duplicate term 2',
+                schema     => { 'alpha' => ['ALPHA'] },
+                selection  => [],
+                expect_err => qr/same name/i,
+            },
+            {
+                name       => 'duplicate term 3',
+                schema     => { 'ALPHA' => ['alpha'] },
+                selection  => [],
+                expect_err => qr/same name/i,
+            },
+            {
+                name       => 'duplicate term 4',
+                schema     => { 'alpha' => [], 'bravo' => ['alpha'] },
+                selection  => [],
+                expect_err => qr/same name/i,
+            },
+            {
+                name       => 'duplicate term 5',
+                schema     => { 'alpha' => [ 'bravo', 'bravo' ] },
+                selection  => [],
+                expect_err => qr/same name/i,
+            },
+            {
+                name       => 'duplicate term 6',
+                schema     => { 'alpha' => ['bravo'], 'charlie' => ['bravo'] },
+                selection  => [],
+                expect_err => qr/same name/i,
+            },
+            {
+                name       => 'unrecognized test case 1',
+                schema     => { 'alpha' => [] },
+                selection  => ['all'],
+                expect_err => qr/unrecognized/i,
+            },
+            {
+                name       => 'unrecognized test case 2',
+                schema     => { 'alpha' => [] },
+                selection  => ['alpha'],
+                expect_err => qr/unrecognized/i,
+            },
+        );
+        for my $case ( @cases ) {
+            subtest $case->{name} => sub {
+                my $test_case_set;
+                local $@;
+                eval {
+                    $test_case_set = Zonemaster::CLI::TestCaseSet->new(    #
+                        $case->{selection},
+                        $case->{schema},
+                    );
+                };
+
+                my $err = $@;
+                my $actual;
+                if ( !$err ) {
+                    $actual = {
+                        terms   => [ sort keys %{ $test_case_set->{_terms} } ],
+                        methods => [ $test_case_set->to_list ],
+                    };
+                }
+
+                if ( defined $case->{expect_err} ) {
+                    like $err, $case->{expect_err}, "error";
+                }
+                else {
+                    is $err, "", "no error";
+                }
+                if ( defined $case->{expect_ok} ) {
+                    eq_or_diff $actual, $case->{expect_ok}, "result";
+                }
+                else {
+                    eq_or_diff $actual, undef, "no result";
+                }
+            };    ## end sub
+        } ## end for my $case ( @cases )
+    };    ## end 'new' => sub
+
+    subtest 'apply_modifier' => sub {
+        my @cases = (
+            {
+                name      => 'empty',
+                schema    => {},
+                selection => [],
+                modifiers => [],
+                expected  => [],
+            },
+            {
+                name      => 'no modifiers',
+                schema    => { basic => [ 'basic01', 'basic02' ] },
+                selection => ['basic01'],
+                modifiers => [],
+                expected  => ['basic01'],
+            },
+            {
+                name      => 'add a new case',
+                schema    => { basic => [ 'basic01', 'basic02' ] },
+                selection => ['basic01'],
+                modifiers => [ '+',       'basic02' ],
+                expected  => [ 'basic01', 'basic02' ],
+            },
+            {
+                name      => 'add the same case',
+                schema    => { basic => [ 'basic01', 'basic02' ] },
+                selection => ['basic01'],
+                modifiers => [ '+', 'basic01' ],
+                expected  => ['basic01'],
+            },
+            {
+                name      => 'replace',
+                schema    => { basic => [ 'basic01', 'basic02' ] },
+                selection => ['basic01'],
+                modifiers => [ '', 'basic02' ],
+                expected  => ['basic02'],
+            },
+            {
+                name      => 'module expansion',
+                schema    => { basic => ['basic01'], extra => [ 'extra01', 'extra02' ] },
+                selection => ['basic01'],
+                modifiers => [ '',        'extra' ],
+                expected  => [ 'extra01', 'extra02' ],
+            },
+            {
+                name      => 'all',
+                schema    => { basic => ['basic01'], extra => [ 'extra01', 'extra02' ] },
+                selection => ['basic01'],
+                modifiers => [ '', 'all' ],
+                expected  => [ 'basic01', 'extra01', 'extra02' ],
+            },
+            {
+                name      => 'multiple modifiers',
+                schema    => { basic => ['basic01'], extra => [ 'extra01', 'extra02' ] },
+                selection => ['basic01'],
+                modifiers => [ '', 'all', '-', 'basic' ],
+                expected  => [ 'extra01', 'extra02' ],
+            },
+            {
+                name      => 'invalid operator',
+                schema    => { basic => [ 'basic01', 'basic02' ] },
+                selection => ['basic01'],
+                modifiers => [ '*', 'basic02' ],
+                error     => qr{unrecognized operator}i,
+            },
+        );
+        for my $case ( @cases ) {
+            subtest $case->{name} => sub {
+                my $test_case_set = Zonemaster::CLI::TestCaseSet->new(    #
+                    $case->{selection},
+                    $case->{schema},
+                );
+
+                local $@ = '';
+                eval {
+                    while ( @{ $case->{modifiers} } ) {
+                        my $op   = shift @{ $case->{modifiers} };
+                        my $term = shift @{ $case->{modifiers} };
+                        $test_case_set->apply_modifier( $op, $term );
+                    }
+                };
+                my $error = $@;
+
+                if ( exists $case->{expected} ) {
+                    is $error, '';
+                    eq_or_diff [ $test_case_set->to_list ], $case->{expected};
+                }
+                else {
+                    like $error, $case->{error};
+                }
+            };
+        } ## end for my $case ( @cases )
+    };
+};
+
+for my $msg ( @{ $log->msgs } ) {
+    my $text = sprintf( "%s: %s", $msg->{level}, $msg->{message} );
+    if ( $msg->{level} =~ /trace|debug|info|notice/ ) {
+        note $text;
+    }
+    else {
+        diag $text;
+    }
+}
+
+Test::NoWarnings::had_no_warnings();
+done_testing;
diff --git a/t/usage.t b/t/usage.t
index fdfa4bcb..2529da6d 100644
--- a/t/usage.t
+++ b/t/usage.t
@@ -19,6 +19,14 @@ use Test::Differences;
 use Zonemaster::CLI;
 use JSON::Validator;
 
+# Force locale C for these unit tests. They depend on the print outs not being
+# translated. See zonemaster/zonemaster-cli/issues/438 and
+# https://github.com/zonemaster/zonemaster-cli/issues/438#issuecomment-2996235684
+$ENV{LC_ALL} = "C.UTF-8";
+delete $ENV{LANG};
+delete $ENV{LANGUAGE};
+
+
 # CONSTANTS
 
 Readonly::Array my @SIG_NAMES => do {
@@ -97,7 +105,7 @@ sub check_success {
         }
 
         is $exitstatus, $Zonemaster::CLI::EXIT_SUCCESS, 'success exit status';
-    };
+    }; ## end sub
 } ## end sub check_success
 
 sub check_success_report {
@@ -369,6 +377,11 @@ do {
             INFO \s+ \d+
             .*
             DEBUG \s+ \d+
+            .*
+            Level \s+ \QMessage tag\E \s+ \QCount\E
+            .*
+            INFO \s+ \w+ \s+ \d+
+            .*
         }msx,
         json => {
             type       => "object",
@@ -385,9 +398,15 @@ do {
         text => qr{
             \QLooks OK.\E
             .*
-            Server \s+ Max \s+ Min \s+ Avg \s+ Stddev \s+ Median \s+ Total
+            \QName servers\E \s+ Max \s+ Min \s+ Avg \s+ Stddev \s+ Median \s+ Total \s+ Count
+            .*
+            \QChild zone\E
+            .*
+            \QParent zone\E
             .*
-            \Qa.root-servers.net/\E
+            Other
+            .*
+            \QGrand total\E \s+ \d+
         }msx,
         json => {
             type       => "object",
@@ -396,8 +415,30 @@ do {
                 nstimes => {
                     type  => "array",
                     items => {
-                        type     => "object",
-                        required => [qw( avg max median min ns stddev total)],
+                        type       => "object",
+                        properties => {
+                            child => {
+                                type  => "array",
+                                items => {
+                                    type     => "object",
+                                    required => [qw( avg max median min ns stddev total count)],
+                                },
+                            },
+                            parent => {
+                                type  => "array",
+                                items => {
+                                    type     => "object",
+                                    required => [qw( avg max median min ns stddev total count)],
+                                },
+                            },
+                            other => {
+                                type  => "array",
+                                items => {
+                                    type     => "object",
+                                    required => [qw( avg max median min ns stddev total count)],
+                                },
+                            },
+                        },
                     },
                 },
             },
@@ -505,15 +546,16 @@ do {
 
     check_usage_error 'unrecognized option', ['--foobar'], qr{unknown option}i;
 
-    check_usage_error '--test BAD_MODULE', [ '--test', '!%~&', 'example.' ], qr{invalid input}i;
+    check_usage_error '--test BAD_MODULE', [ '--test', '!%~&', 'example.' ], qr{unrecognized term '!%~&' in --test}i;
 
     check_usage_error '--test UNKNOWN_MODULE/TESTCASE', [ '--test', 'foobar/foobar01', 'example.' ],
-      qr{unrecognized test module}i;
+      qr{unrecognized term 'foobar/foobar01' in --test}i;
 
     check_usage_error '--test MODULE/UNKNOWN_TESTCASE', [ '--test', 'basic/foobar01', 'example.' ],
-      qr{unrecognized test case}i;
+      qr{unrecognized term 'basic/foobar01' in --test}i;
 
-    check_usage_error '--test MODULE//TESTCASE', [ '--test', 'basic//basic01', 'example.' ], qr{invalid input}i;
+    check_usage_error '--test MODULE//TESTCASE', [ '--test', 'basic//basic01', 'example.' ],
+      qr{unrecognized term 'basic//basic01' in --test}i;
 
     check_usage_error '--ns BAD_NAME', [ '--ns', '!%~&', 'example.' ], qr{invalid name}i;
 
@@ -643,6 +685,26 @@ do {
         return $source6 eq '2001:db8::2';
       };
 
+    check_success 'override test_cases',
+      [ '--dump-profile', '--profile=t/usage.profile', '--test=basic01' ], sub {
+        my ( $profile ) = parse_json_stream( $_[0] );
+
+        return
+             ref $profile->{test_cases} eq 'ARRAY'
+          && scalar @{ $profile->{test_cases} } == 1
+          && $profile->{test_cases}[0] eq 'basic01';
+      };
+
+    check_success 'override test_cases twice',
+      [ '--dump-profile', '--profile=t/usage.profile', '--test=-all', '--test=+basic01' ], sub {
+        my ( $profile ) = parse_json_stream( $_[0] );
+
+        return
+             ref $profile->{test_cases} eq 'ARRAY'
+          && scalar @{ $profile->{test_cases} } == 1
+          && $profile->{test_cases}[0] eq 'basic01';
+      };
+
     check_success '--restore', [ "--restore=$PATH_NORMAL_DATAFILE", '--test=basic01', '--level=INFO', '--raw', '.' ],
       qr{B01_CHILD_FOUND};
 };