4 files changed, 34 insertions, 57 deletions
diff --git a/t/1compile.t b/t/1compile.t
index 7241197ca..8886d685b 100644
--- a/t/1compile.t
+++ b/t/1compile.t
@@ -35,10 +35,10 @@
 #################
 #Bugzilla Test 1#
 ###Compilation###
-
-BEGIN { use Test::More tests => 55; }
 BEGIN { use lib 't/'; }
 BEGIN { use Support::Files; }
+BEGIN { $tests = @Support::Files::testitems + 4; }
+BEGIN { use Test::More tests => $tests; }
 
 # First now we test the scripts                                                   
 @testitems = @Support::Files::testitems; 
diff --git a/t/2goodperl.t b/t/2goodperl.t
index ff805b644..8efa8367a 100644
--- a/t/2goodperl.t
+++ b/t/2goodperl.t
@@ -35,9 +35,10 @@
 #Bugzilla Test 2#
 ####GoodPerl#####
 
-BEGIN { use Test::More tests => 102; }
 BEGIN { use lib 't/'; }
 BEGIN { use Support::Files; }
+BEGIN { $tests = @Support::Files::testitems * 2; }
+BEGIN { use Test::More tests => $tests; }
 
 @testitems = @Support::Files::testitems; # get the files to test.
 
diff --git a/t/3safesys.t b/t/3safesys.t
index ced6d00ed..d11455513 100644
--- a/t/3safesys.t
+++ b/t/3safesys.t
@@ -35,9 +35,10 @@
 #Bugzilla Test 3#
 ###Safesystem####
 
-BEGIN { use Test::More tests => 51; }
 BEGIN { use lib 't/'; }
 BEGIN { use Support::Files; }
+BEGIN { $tests = @Support::Files::testitems; }    
+BEGIN { use Test::More tests => $tests; }
 
 @testitems = @Support::Files::testitems; 
 my $verbose = $::ENV{VERBOSE};
diff --git a/t/Support/Files.pm b/t/Support/Files.pm
index 753e94004..a2d38638f 100644
--- a/t/Support/Files.pm
+++ b/t/Support/Files.pm
@@ -33,58 +33,33 @@
 
 package Support::Files;
 
-@testitems = split("\n",qq(
-bug_form.pl #1
-buglist.cgi #2
-changepassword.cgi #3
-checksetup.pl #4
-colchange.cgi #5
-collectstats.pl #6
-createaccount.cgi #7
-createattachment.cgi #8
-defparams.pl #9
-describecomponents.cgi #10
-describekeywords.cgi #11
-doeditparams.cgi #12
-doeditvotes.cgi #13
-duplicates.cgi #14
-editcomponents.cgi #15
-editgroups.cgi #16
-editkeywords.cgi #27
-editmilestones.cgi #18
-editparams.cgi #19
-editproducts.cgi #20
-editusers.cgi #21
-editversions.cgi #22
-enter_bug.cgi #23
-globals.pl #24
-importxml.pl #25
-long_list.cgi #26
-move.pl #27
-new_comment.cgi #28
-post_bug.cgi #29
-process_bug.cgi #30
-query.cgi #31
-queryhelp.cgi #32
-quips.cgi #33
-relogin.cgi #34
-reports.cgi #35
-sanitycheck.cgi #36
-show_activity.cgi #37
-show_bug.cgi #38
-showattachment.cgi #39
-showdependencygraph.cgi #40
-showdependencytree.cgi #41
-showvotes.cgi #42
-syncshadowdb #43
-token.cgi #44
-userprefs.cgi #45
-whineatnews.pl #46
-xml.cgi #47
-attachment.cgi #48
-editattachstatuses.cgi #49
-globals.pl #50
-CGI.pl #51
-));
+@additional_files = ('syncshadowdb');
+@exclude_files    = ('processmail');
+
+$file = '*';
+@files = glob($file);
+
+sub isTestingFile {
+  my ($file) = @_;
+  if ($file =~ /\.cgi$|\.pl$/) {
+    return 1;
+  }
+  my $additional;
+  foreach $additional (@additional_files) {
+    if ($file eq $additional) { return 1; }
+  }
+  my $exclude;
+  foreach $exclude (@exclude_files) {
+  	if ($file eq $exclude) { return undef; } # get rid of excluded files.
+  }
+  return undef;
+}
+
+foreach $currentfile (@files) {
+	if (isTestingFile($currentfile)) {
+		push(@testitems,$currentfile);
+	}
+}
+
 
 1;