Index: /branches/release-41/t/51-objectsync.t
===================================================================
--- /branches/release-41/t/51-objectsync.t (revision 1098)
+++ /branches/release-41/t/51-objectsync.t (revision 2680)
@@ -3,15 +3,20 @@
 my $number = 38;
 
-use Test::More tests => 38;
-
+use Test::More;
+
+use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
 use MT;
-use MT::Author;
-use MT::Auth;
 
 use vars qw( $DB_DIR $T_CFG );
-use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
-use MT::Test qw(:db :data);
+use MT::Test;
+my $mt = MT->new() or die MT->errstr;
 
 SKIP: {
+if ( ! MT->component('enterprise') ) {
+    plan skip_all => "Enterprise pack is not installed.";
+} else {
+    plan tests => $number;
+}
+
 eval "require Net::LDAP;";
 if ($@) {
@@ -22,4 +27,9 @@
     skip "MT::LDAP is not found.  Did you enable Enterprise Pack?", $number;
 }
+
+require MT::Author;
+require MT::Auth;
+require MT::LDAP;
+MT::Test->import( qw( :db :test ) );
 
 &ldapdelete( name => 'Bob D' );
@@ -28,5 +38,4 @@
 &ldapdelete( name => 'Melody' );
 
-my $mt = MT->new( Config => $T_CFG ) or die MT->errstr;
 if (!MT->config->LDAPUserIdAttribute) {
     print "Set LDAPUserIdAttribute directive or this test will fail.\n";
@@ -211,6 +220,4 @@
 }
     
-use MT::LDAP;
-
 sub ldapadd {
     my (%opt) = @_;
Index: /branches/release-41/t/52-ldap.t
===================================================================
--- /branches/release-41/t/52-ldap.t (revision 1098)
+++ /branches/release-41/t/52-ldap.t (revision 2680)
@@ -4,13 +4,19 @@
 my $number = 15;
 
-use Test::More tests => 15;
+use Test::More;
 
+use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
 use MT;
+use vars qw( $DB_DIR $T_CFG );
+use MT::Test;
 
-use vars qw( $DB_DIR $T_CFG );
-use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
-use MT::Test qw(:db :data);
+my $mt = MT->instance or die MT->errstr;
+SKIP: {
+if ( !$mt->component('enterprise') ) {
+    plan skip_all => "Enterprise pack is not installed";
+} else {
+    plan tests => $number;
+}
 
-SKIP: {
 eval "require Net::LDAP;";
 if ($@) {
@@ -23,5 +29,6 @@
 {
 # @test create MT object
-my $mt = MT->new( Config => $T_CFG ) or die MT->errstr;
+MT::Test->import( qw(:db :data) );
+
 ok($mt);