Index: branches/release-41/t/54-usersgroupsroles.t
===================================================================
--- branches/release-41/t/54-usersgroupsroles.t (revision 1098)
+++ branches/release-41/t/54-usersgroupsroles.t (revision 2679)
@@ -2,5 +2,5 @@
 
 use strict;
-use Test::More qw(no_plan);
+use Test::More;
 
 BEGIN {
@@ -8,6 +8,19 @@
 }
 use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
-use MT::Test qw(:db);
+use MT::Test;
 use MT;
+my $mt;
+BEGIN {
+    $mt = new MT;
+    my $grp_class = MT->model('group');
+    if (! $grp_class ) {
+        plan skip_all => "Groups are unavailable for testing.";
+    } else {
+        plan tests => 16;
+    }
+}
+
+MT::Test->import( qw( :db ) );
+
 use MT::Blog;
 use MT::Author;
Index: branches/release-41/t/53-grouptsync.t
===================================================================
--- branches/release-41/t/53-grouptsync.t (revision 1098)
+++ branches/release-41/t/53-grouptsync.t (revision 2679)
@@ -2,18 +2,20 @@
 
 use strict;
-use MT::Author;
+use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib';
 use MT;
-use strict;
-use MT::Auth;
+use Test::More;
 
 my $number = 25;
 
-use Test::More tests => 25;
-
-use MT;
-
 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->instance;
+
+if ( !$mt->component('enterprise') ) {
+    plan skip_all => "Enterprise pack is not installed.";
+} else {
+    plan tests => $number;
+}
 
 SKIP: {
@@ -27,5 +29,10 @@
 }
 
-my $mt = MT->new( Config => $T_CFG ) or die MT->errstr;
+MT::Test->import( qw(:db :data) );
+
+require MT::Author;
+require MT::Auth;
+require MT::Auth::LDAP;
+
 if (!MT::ConfigMgr->instance->LDAPUserIdAttribute) {
     print "Set LDAPUserIdAttribute directive or this test will fail.\n";
@@ -180,7 +187,4 @@
 }
     
-use MT::Auth;
-use MT::Auth::LDAP;
-
 sub ldapadd_user {
     my (%opt) = @_;