-use CGI qw(:no_debug);
-use CGI::Ex;
-use Test;
-
-BEGIN { plan tests => 1 }
-
-local $/;
-my $html = qq{<input type="submit" value="Commit">};
-
-my $q = new CGI;
-
-$q->param( "name", "John Smith" );
-my $fif = new CGI::Ex;
-my $output = $fif->fill(
- scalarref => \$html,
- fobject => $q
-);
-
-ok($html =~ m!<input( type="submit"| value="Commit"){2}>!);
+use_ok('CGI::Ex::Fill');
+
+SKIP: {
+ skip("CGI.pm not found", 1) if ! eval { require CGI };
+ CGI->import(':no_debug');
+
+ local $/;
+ my $html = qq{<input type="submit" value="Commit">};
+
+ my $q = CGI->new;
+
+ $q->param( "name", "John Smith" );
+ my $output = CGI::Ex::Fill::form_fill($html, $q);
+
+ ok($html =~ m!<input( type="submit"| value="Commit"){2}>!);
+};