diff --git a/Changes b/Changes
index 7437cca..46cd3d4 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+0.03007 2008-12-08
+
+    - Remove Test::Aggregate - seeing test failures under perl 5.8.x
+
 0.03006 2008-12-03
 
     - New DateTime element.
diff --git a/MANIFEST b/MANIFEST
index 02a15a0..1a0def4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -607,7 +607,6 @@ t-aggregated/validator.t
 t/01use.t
 t/04basic.t
 t/04basic.yml
-t/aggregate.t
 t/bugs/yaml_utf8.t
 t/bugs/yaml_utf8.txt
 t/bugs/yaml_utf8.yml
diff --git a/META.yml b/META.yml
index 393d94c..db9f060 100644
--- a/META.yml
+++ b/META.yml
@@ -5,7 +5,6 @@ author:
 build_requires:
   CGI: 0
   ExtUtils::MakeMaker: 6.11
-  Test::Aggregate: 0.35
   Test::NoWarnings: 0
 distribution_type: module
 generated_by: 'Module::Install version 0.77'
@@ -55,4 +54,4 @@ requires:
   perl: 5.8.1
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.03006
+version: 0.03007
diff --git a/Makefile.PL b/Makefile.PL
index d952ed4..4ac92b1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -40,10 +40,9 @@ requires 'Template'; # form->start and ->end still require TT
 requires 'YAML::Syck' => '1.05';
 
 test_requires 'CGI'; # for file POST tests
-test_requires 'Test::Aggregate' => 0.35;
 test_requires 'Test::NoWarnings';
 
-tests_recursive;
+tests_recursive( 't', 't-aggregated' );
 
 no_index directory => 'examples';
 
diff --git a/lib/HTML/FormFu.pm b/lib/HTML/FormFu.pm
index c373e8c..dd433a5 100644
--- a/lib/HTML/FormFu.pm
+++ b/lib/HTML/FormFu.pm
@@ -108,7 +108,7 @@ __PACKAGE__->mk_inherited_merging_accessors( qw( tt_args config_callback ) );
 *plugins           = \&plugin;
 *add_plugins       = \&add_plugin;
 
-our $VERSION = '0.03006';
+our $VERSION = '0.03007';
 $VERSION = eval $VERSION;
 
 Class::C3::initialize();
diff --git a/t/aggregate.t b/t/aggregate.t
deleted file mode 100644
index dcc96af..0000000
--- a/t/aggregate.t
+++ /dev/null
@@ -1,12 +0,0 @@
-use strict;
-use warnings;
-
-use Test::Aggregate;
-
-my $tester = Test::Aggregate->new({
-    dirs       => 't-aggregated',
-    verbose    => 1,
-    #check_plan => 1,
-});
-
-$tester->run;