diff --git a/Makefile.PL b/Makefile.PL
index 7eb5bea..64cd445 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -19,7 +19,7 @@ test_requires 'Any::Moose' => '0.10';
 test_requires 'Test::More';
 test_requires 'Test::UseAllModules';
 test_requires 'Test::Deep';
-test_requires 'Test::Data::Scalar';
+test_requires 'Test::Data';
 
 author_tests 'xt';
 author_requires 'Test::Pod';
@@ -32,6 +32,6 @@ author_requires 'ShipIt::Step::DistClean';
 include_deps 'Test::More';
 include_deps 'Test::UseAllModules';
 include_deps 'Test::Deep';
-include_deps 'Test::Data::Scalar';
+include_deps 'Test::Data';
 
 WriteAll;
diff --git a/lib/MouseX/AttributeHelpers.pm b/lib/MouseX/AttributeHelpers.pm
index f27c128..c4c3322 100644
--- a/lib/MouseX/AttributeHelpers.pm
+++ b/lib/MouseX/AttributeHelpers.pm
@@ -3,6 +3,9 @@ package MouseX::AttributeHelpers;
 use 5.006_002;
 our $VERSION = '0.07';
 
+use strict;
+use warnings;
+
 use Mouse::Util qw(load_class);
 
 # These submodules are automatically loaded by register_implementation()