scripts/t: Move constant tests plan to ‘use Test::More’ time

scripts/t/600_Dpkg_Changelog.t

@@ -16,22 +16,11 @@
 use strict;
 use warnings;
 
+use Test::More tests => 84;
+
 use File::Basename;
 use Dpkg::File;
 
-BEGIN {
-    my $no_examples = 4;
-    my $no_err_examples = 1;
-    my $no_tests = $no_examples * 5
-	+ $no_err_examples * 2
-	+ 26 # countme
-	+ 13 # fields
-	+ 1  # regressions
-	+ 22;
-
-    require Test::More;
-    import Test::More tests => $no_tests;
-}
 BEGIN {
     use_ok('Dpkg::Changelog');
     use_ok('Dpkg::Changelog::Debian');

scripts/t/910_merge_changelogs.t

@@ -13,17 +13,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use Test::More tests => 3;
+
 use Dpkg::IPC;
 use File::Spec;
-use Test::More;
 use File::Compare;
 use File::Temp qw(tempfile);
 
 use strict;
 use warnings;
 
-plan tests => 3;
-
 my $srcdir = $ENV{srcdir} || '.';
 my $datadir = "$srcdir/t/910_merge_changelogs";