Index: /branches/release-41/lib/MT/XMLRPCServer.pm
===================================================================
--- /branches/release-41/lib/MT/XMLRPCServer.pm (revision 2264)
+++ /branches/release-41/lib/MT/XMLRPCServer.pm (revision 2709)
@@ -14,5 +14,5 @@
     my $cfg = $ENV{MOD_PERL} ?
         Apache->request->dir_config('MTConfig') :
-        $MT::XMLRPCServer::MT_DIR . '/mt-config.cgi';
+        ($ENV{MT_CONFIG} || $MT::XMLRPCServer::MT_DIR . '/mt-config.cgi');
     my $mt = MT->new( Config => $cfg )
         or die MT::XMLRPCServer::_fault(MT->errstr);
Index: /branches/release-41/t/28-xmlrpc.t
===================================================================
--- /branches/release-41/t/28-xmlrpc.t (revision 2529)
+++ /branches/release-41/t/28-xmlrpc.t (revision 2709)
@@ -14,9 +14,7 @@
 $ENV{HTTP_HOST} = 'localhost';
 
-use vars qw( $DB_DIR $T_CFG );
-my $mt = MT->new( Config => $T_CFG ) or die MT->errstr;
+use MT::Test qw(:db :data);
+my $mt = MT->new() or die MT->errstr;
 isa_ok($mt, 'MT');
-
-use MT::Test qw(:db :data);
 
 my $base_uri = '/mt-xmlrpc.cgi';
@@ -436,5 +434,5 @@
             my $url = $result->{url};
             is( $url, 'http://narnia.na/nana/movable-type-logo.gif' );
-            my $asset = MT::Asset->load(undef, { sort => 'created_on', direction => 'descend', limit => 1 });
+            my $asset = MT::Asset::Image->load(undef, { sort => 'created_on', direction => 'descend', limit => 1 });
             ok($asset, 'asset loaded');
             is( $asset->mime_type, 'image/gif' );