diff --git a/webtools/bugzilla/t/004template.t b/webtools/bugzilla/t/004template.t
new file mode 100644
index 000000000000..7077a6f173c0
--- /dev/null
+++ b/webtools/bugzilla/t/004template.t
@@ -0,0 +1,64 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code are the Bugzilla tests.
+#
+# The Initial Developer of the Original Code is Jacob Steenhagen.
+# Portions created by Jacob Steenhagen are
+# Copyright (C) 2001 Jacob Steenhagen. All
+# Rights Reserved.
+#
+# Contributor(s): Jacob Steenhagen <jake@acutex.net>
+#
+
+#################
+#Bugzilla Test 4#
+##Templates######
+
+BEGIN { use lib "t/"; }
+BEGIN { use Support::Templates; }
+BEGIN { $tests = @Support::Templates::testitems * 2; }
+BEGIN { use Test::More tests => $tests; }
+
+use Template;
+
+my @testitems = @Support::Templates::testitems;
+my $verbose = $::ENV{VERBOSE};
+
+# Check to make sure all templates that are referenced in
+# Bugzilla exist in the proper place.
+my $path = "template/default";
+foreach my $file(@testitems) {
+    if (-e $path . "/" . $file) {
+        ok(1, "$file exists");
+    } else {
+        ok(0, "$file does not exist");
+    }
+}
+
+# Processes all the templates to make sure they have good syntax
+my $template = Template->new ({
+                 INCLUDE_PATH => $path,
+                 RELATIVE => 1
+                 });
+
+open SAVEOUT, ">&STDOUT";     # stash the original output stream
+open STDOUT, "> /dev/null";   # discard all output
+foreach my $file(@testitems) {
+    if ($template->process($file)) {
+        ok(1, "$file");
+    } else {
+        ok(0, "$file has bad syntax");
+    }
+}
+open STDOUT, ">&SAVEOUT";     # redirect back to original stream
+close SAVEOUT;
diff --git a/webtools/bugzilla/t/Support/Templates.pm b/webtools/bugzilla/t/Support/Templates.pm
new file mode 100644
index 000000000000..360fdc4ccc62
--- /dev/null
+++ b/webtools/bugzilla/t/Support/Templates.pm
@@ -0,0 +1,44 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code are the Bugzilla tests.
+#
+# The Initial Developer of the Original Code is Jacob Steenhagen.
+# Portions created by Jacob Steenhagen are
+# Copyright (C) 2001 Jacob Steenhagen. All
+# Rights Reserved.
+#
+# Contributor(s): Jacob Steenhagen <jake@acutex.net>
+#
+
+package Support::Templates;
+
+# Scan Bugzilla's code looking for templates used and put them
+# in the @testitems array to be used by the template.t test.
+
+my @files = glob('*');
+my %t;
+
+foreach my $file (@files) {
+    open (FILE, $file);
+    my @lines = <FILE>;
+    close (FILE);
+    foreach my $line (@lines) {
+	if ($line =~ m/template->process\(\"(.+?)\", .+?\)/) {
+            $template = $1;
+	    push (@testitems, $template) unless $t{$template};
+	    $t{$template} = 1;
+	}
+    }
+}
+
+1;