diff --git a/auto.ini b/auto.ini
index 5855e22..4e71e7e 100644
--- a/auto.ini
+++ b/auto.ini
@@ -1,33 +1,11 @@
 [add_build_requires]
-; FIXME -- these all need to be rechecked to ensure that we're not just
-; duplicating the find_optional_requires script
-;
 ; optional tests
-perl(DateTime::Format::MySQL)=0
 perl(Text::CSV_XS)=0
-perl(Test::Memory::Cycle)=0
-perl(Test::Pod)=0
-perl(Test::Pod::Coverage)=0
-perl(SQL::Translator)=0
-perl(DateTime)=0
-perl(DateTime::Format::Oracle)=0
-perl(DBIx::ContextualFetch)=0
-; optional tests as of 0.08102
-perl(Clone)=0
-perl(Time::Piece)=0
-perl(Time::Piece::MySQL)=0
-; .. the following are also needed as a requires for replicated dbd support
-perl(MooseX::AttributeHelpers)=0.12
-perl(Class::MOP)=0.63
-perl(Moose)=0.54
-perl(Moose::Util::TypeConstraints)=0.54
-; CDBI-compat tests...
-perl(Class::Data::Inheritable)=0
 perl(Class::Inspector)=1.24
-perl(Class::Trigger)=0
 ;
 perl(Test::Moose)=0
 
 [metadata_filtering]
-; this wouldn't be an issue if we'd filter dupes in perl_default_filter
+; Note that maintainertool automatically generates filter macro statements for
+; packages/directories marked as "no_index" in META.yml.
 filter_from_requires=/^perl(DBD::Pg)$/d
diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec
index 8d4d37d..ef31db9 100644
--- a/perl-DBIx-Class.spec
+++ b/perl-DBIx-Class.spec
@@ -94,9 +94,9 @@ BuildRequires: perl(namespace::clean) >= 0.11
 %filter_provides_in %{perl_vendorlib}/DBIx/Class/SQLAHacks
 %filter_requires_in %{perl_vendorlib}/DBIx/Class/SQLAHacks
 %filter_from_provides /^perl(DBIx::Class::SQLAHacks)/d
-%filter_From_requires /^perl(DBIx::Class::SQLAHacks)/d
+%filter_from_requires /^perl(DBIx::Class::SQLAHacks)/d
 %filter_from_provides /^perl(DBIx::Class::Storage::DBIHacks)/d
-%filter_From_requires /^perl(DBIx::Class::Storage::DBIHacks)/d
+%filter_from_requires /^perl(DBIx::Class::Storage::DBIHacks)/d
 %perl_default_filter
 }
 %{?perl_default_subpackage_tests}