diff --git a/dist.ini b/dist.ini
index 16f8569..ab05cc7 100644
--- a/dist.ini
+++ b/dist.ini
@@ -6,15 +6,18 @@ license          = Perl_5
 copyright_holder = Gerda Shank
 copyright_year   = 2013
 
-version = 0.29
-
 [@Git]
 tag_format = %v
 
+[Git::NextVersion]
+version_regexp = ^([\d._]+)$
+
 [@Basic]
 [InstallGuide]
 [MetaJSON]
 
+[PkgVersion]
+
 [MetaResources]
 bugtracker.web    = https://rt.cpan.org/Public/Dist/Display.html?Name=HTML-FormHandler-Model-DBIC
 bugtracker.mailto = bug-HTML-FormHandler-Model-DBIC@rt.cpan.org
@@ -26,8 +29,8 @@ repository.type   = git
 
 ; You have to have Dist::Zilla::Plugin::<Name> for these to work
 [PodWeaver]
-[NoTabsTests]
-[EOLTests]
+[Test::NoTabs]
+[Test::EOL]
 [Signature]
 [CheckChangeLog]
 
diff --git a/lib/HTML/FormHandler/Generator/DBIC.pm b/lib/HTML/FormHandler/Generator/DBIC.pm
index ff12712..f9e7e04 100644
--- a/lib/HTML/FormHandler/Generator/DBIC.pm
+++ b/lib/HTML/FormHandler/Generator/DBIC.pm
@@ -4,7 +4,6 @@ package HTML::FormHandler::Generator::DBIC;
 use Moose;
 use DBIx::Class;
 use Template;
-our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
diff --git a/lib/HTML/FormHandler/Model/DBIC.pm b/lib/HTML/FormHandler/Model/DBIC.pm
index 225e277..83b8a44 100644
--- a/lib/HTML/FormHandler/Model/DBIC.pm
+++ b/lib/HTML/FormHandler/Model/DBIC.pm
@@ -5,8 +5,6 @@ use Moose;
 extends 'HTML::FormHandler';
 with 'HTML::FormHandler::TraitFor::Model::DBIC';
 
-our $VERSION = '0.29';
-
 =head1 SUMMARY
 
 Empty base class - see L<HTML::FormHandler::TraitFor::Model::DBIC> for
diff --git a/lib/HTML/FormHandler/TraitFor/Model/DBIC.pm b/lib/HTML/FormHandler/TraitFor/Model/DBIC.pm
index 7720978..4333c8f 100644
--- a/lib/HTML/FormHandler/TraitFor/Model/DBIC.pm
+++ b/lib/HTML/FormHandler/TraitFor/Model/DBIC.pm
@@ -9,8 +9,6 @@ use DBIx::Class::ResultClass::HashRefInflator;
 use DBIx::Class::ResultSet::RecursiveUpdate;
 use Scalar::Util ('blessed');
 
-our $VERSION = '0.26';
-
 =head1 SYNOPSIS
 
 Subclass your form from HTML::FormHandler::Model::DBIC:
diff --git a/t/lib/BookDB.pm b/t/lib/BookDB.pm
index adc49b6..03f3c13 100644
--- a/t/lib/BookDB.pm
+++ b/t/lib/BookDB.pm
@@ -5,8 +5,6 @@ use Catalyst ('-Debug',
               'Static::Simple',
 );
 
-our $VERSION = '0.02';
-
 BookDB->config( name => 'BookDB' );
 
 BookDB->setup;