diff --git a/t/run_assets.t b/t/run_assets.t
new file mode 100644
index 000000000..943e64549
--- /dev/null
+++ b/t/run_assets.t
@@ -0,0 +1,22 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use File::Spec::Functions qw( catdir rel2abs );
+use File::Basename;
+use Test::More;
+use Test::Class;
+use Module::Find;
+use lib rel2abs( catdir ( dirname( __FILE__ ), 'tests' ) );
+
+plan skip_all => "Extremely slow asset tests only run if WEBGUI_ASSET_TESTS set"
+    unless $ENV{WEBGUI_ASSET_TESTS};
+useall('Test::WebGUI::Asset');
+Test::Class->runtests;
+
diff --git a/t/run_forms.u b/t/run_forms.t
similarity index 80%
rename from t/run_forms.u
rename to t/run_forms.t
index beb24c100..0bb2fed1c 100644
--- a/t/run_forms.u
+++ b/t/run_forms.t
@@ -9,6 +9,11 @@
 #-------------------------------------------------------------------
 
 use File::Spec::Functions qw( catdir rel2abs );
-use File::Basename qw( dirname );
-use Test::Class::Load rel2abs( catdir ( dirname( __FILE__ ), 'tests' ) );
+use File::Basename;
+use Test::Class;
+use Module::Find;
+use lib rel2abs( catdir ( dirname( __FILE__ ), 'tests' ) );
+
+useall('Test::WebGUI::Form');
 Test::Class->runtests;
+