Index: /branches/release-40/Makefile
===================================================================
--- /branches/release-40/Makefile (revision 1717)
+++ /branches/release-40/Makefile (revision 2573)
@@ -172,8 +172,8 @@
 
 test: code
-	MT_CONFIG=t/mt.cfg perl -Ilib -Iextlib -It/lib -MTest::Harness -e 'runtests @ARGV' t/*.t
+	perl -Ilib -Iextlib -It/lib -MTest::Harness -e 'runtests @ARGV' t/*.t
 
 quick-test: code
-	MT_CONFIG=t/mt.cfg perl -Ilib -Iextlib -It/lib -MTest::Harness -e 'runtests @ARGV'  \
+	perl -Ilib -Iextlib -It/lib -MTest::Harness -e 'runtests @ARGV'  \
 		t/00-compile.t t/01-serialize.t t/04-config.t \
 		t/05-errorhandler.t t/07-builder.t t/08-util.t           \
Index: /branches/release-40/t/00-compile.t
===================================================================
--- /branches/release-40/t/00-compile.t (revision 2548)
+++ /branches/release-40/t/00-compile.t (revision 2573)
@@ -5,5 +5,6 @@
 use warnings;
 
-use lib 'lib', 'extlib';
+use lib 't/lib', 'lib', 'extlib';
+use MT::Test;
 
 use Test::More tests => 181;
Index: /branches/release-40/t/21-app-callbacks.t
===================================================================
--- /branches/release-40/t/21-app-callbacks.t (revision 2069)
+++ /branches/release-40/t/21-app-callbacks.t (revision 2573)
@@ -6,5 +6,4 @@
 use Test::More tests => 3;
 use CGI;
-use DB_File;
 
 use lib 'extlib';
@@ -12,4 +11,5 @@
 use lib 'lib';
 
+use MT::Test;
 use MT;
 use MT::Plugin;
@@ -17,6 +17,4 @@
 use MT::App::CMS;
 use MT::Permission;
-
-use vars qw($T_CFG);
 
 use lib 't';
@@ -27,5 +25,5 @@
 my @result_cats = ();
 
-my $cms = MT::App::CMS->new(Config => $T_CFG);
+my $cms = MT::App::CMS->new();
 
 my $plugin = MT::Plugin->new({name => "21-callbacks.t"});
@@ -48,4 +46,6 @@
 $q->param(blog_id => $entry2->blog_id);
 $q->param(category_ids => 17);
+$q->param(author_id => 1);
+$q->param(status => 1);
 # $q->param(username => 'Chuck D');
 # $q->param(password => 'bass');
Index: /branches/release-40/t/26-pings.t
===================================================================
--- /branches/release-40/t/26-pings.t (revision 2548)
+++ /branches/release-40/t/26-pings.t (revision 2573)
@@ -54,5 +54,6 @@
 SKIP: {
     skip("Test update server $server is unreachable", 5)
-        unless ok($p->ping($server), 'ping');
+        unless $p->ping($server);
+    ok(1, "ping");
 
 {