From 9e80a33efb1c5b9ef7d4c8a4c362623d61696191 Mon Sep 17 00:00:00 2001
From: Viktor Ashirov <vashirov@redhat.com>
Date: May 10 2019 12:20:38 +0000
Subject: Issue #50353 - Categorize tests by tiers


Bug Description:
We should have different tiers of tests:
tier0 - basic functionality (installation, instance startup, basic operations, import/export, etc.)
tier1 - functional tests for the most used features
tier2 - functional tests for the less used features and tests that take more time to complete (stress tests)
tier3 - long duration tests.

Fix Description:
Use pytest marks per test module or individually.

Fixes https://pagure.io/389-ds-base/issue/50353

Reviewed by: spichugi (Thanks!)

---

diff --git a/dirsrvtests/pytest.ini b/dirsrvtests/pytest.ini
new file mode 100644
index 0000000..48984e5
--- /dev/null
+++ b/dirsrvtests/pytest.ini
@@ -0,0 +1,6 @@
+[pytest]
+markers =
+    tier0: mark a test as part of tier0
+    tier1: mark a test as part of tier1
+    tier2: mark a test as part of tier2
+    tier3: mark a test as part of tier3
diff --git a/dirsrvtests/tests/perf/memberof_test.py b/dirsrvtests/tests/perf/memberof_test.py
index 4a460ea..01b7b63 100755
--- a/dirsrvtests/tests/perf/memberof_test.py
+++ b/dirsrvtests/tests/perf/memberof_test.py
@@ -18,6 +18,8 @@ from lib389._constants import SUFFIX, DN_SCHEMA, DN_DM, DEFAULT_SUFFIX, PASSWORD
     PLUGIN_MANAGED_ENTRY, PLUGIN_AUTOMEMBER, DN_CONFIG_LDBM, HOST_STANDALONE, PORT_STANDALONE
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier3
+
 MEMOF_PLUGIN = ('cn=' + PLUGIN_MEMBER_OF + ',cn=plugins,cn=config')
 MAN_ENTRY_PLUGIN = ('cn=' + PLUGIN_MANAGED_ENTRY + ',cn=plugins,cn=config')
 AUTO_MEM_PLUGIN = ('cn=' + PLUGIN_AUTOMEMBER + ',cn=plugins,cn=config')
diff --git a/dirsrvtests/tests/stress/cos/cos_scale_template_test.py b/dirsrvtests/tests/stress/cos/cos_scale_template_test.py
index 3cc823b..0d0601b 100644
--- a/dirsrvtests/tests/stress/cos/cos_scale_template_test.py
+++ b/dirsrvtests/tests/stress/cos/cos_scale_template_test.py
@@ -20,6 +20,8 @@ from lib389._constants import DEFAULT_SUFFIX
 
 import time
 
+pytestmark = pytest.mark.tier3
+
 # Given this should complete is about 0.005, this is generous.
 # For the final test with 20 templates, about 0.02 is an acceptable time.
 THRESHOLD = 0.05
diff --git a/dirsrvtests/tests/stress/reliabilty/reliab_7_5_test.py b/dirsrvtests/tests/stress/reliabilty/reliab_7_5_test.py
index 3fdbd67..8791e64 100644
--- a/dirsrvtests/tests/stress/reliabilty/reliab_7_5_test.py
+++ b/dirsrvtests/tests/stress/reliabilty/reliab_7_5_test.py
@@ -21,6 +21,8 @@ from lib389.utils import *
 
 from lib389.idm.directorymanager import DirectoryManager
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s' +
                               ' - %(message)s')
diff --git a/dirsrvtests/tests/stress/reliabilty/reliab_conn_test.py b/dirsrvtests/tests/stress/reliabilty/reliab_conn_test.py
index fbe7142..70b73a2 100644
--- a/dirsrvtests/tests/stress/reliabilty/reliab_conn_test.py
+++ b/dirsrvtests/tests/stress/reliabilty/reliab_conn_test.py
@@ -15,6 +15,8 @@ from lib389.idm.directorymanager import DirectoryManager
 from lib389.idm.user import UserAccounts
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/stress/replication/mmr_01_4m-2h-4c_test.py b/dirsrvtests/tests/stress/replication/mmr_01_4m-2h-4c_test.py
index c7bd5a7..71b5883 100644
--- a/dirsrvtests/tests/stress/replication/mmr_01_4m-2h-4c_test.py
+++ b/dirsrvtests/tests/stress/replication/mmr_01_4m-2h-4c_test.py
@@ -12,6 +12,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.repltools import ReplTools
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/stress/replication/mmr_01_4m_test.py b/dirsrvtests/tests/stress/replication/mmr_01_4m_test.py
index f46fb45..782403d 100644
--- a/dirsrvtests/tests/stress/replication/mmr_01_4m_test.py
+++ b/dirsrvtests/tests/stress/replication/mmr_01_4m_test.py
@@ -12,6 +12,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.repltools import ReplTools
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/acl/acivattr_test.py b/dirsrvtests/tests/suites/acl/acivattr_test.py
index c4f9b9c..f9cf096 100644
--- a/dirsrvtests/tests/suites/acl/acivattr_test.py
+++ b/dirsrvtests/tests/suites/acl/acivattr_test.py
@@ -17,7 +17,7 @@ from lib389.idm.nscontainer import nsContainer
 from lib389.idm.domain import Domain
 from lib389.idm.role import FilterRoles
 
-
+pytestmark = pytest.mark.tier1
 
 DNBASE = "o=acivattr,{}".format(DEFAULT_SUFFIX)
 ENG_USER = "cn=enguser1,ou=eng,{}".format(DNBASE)
diff --git a/dirsrvtests/tests/suites/acl/acl_deny_test.py b/dirsrvtests/tests/suites/acl/acl_deny_test.py
index 2856641..8ea6cd2 100644
--- a/dirsrvtests/tests/suites/acl/acl_deny_test.py
+++ b/dirsrvtests/tests/suites/acl/acl_deny_test.py
@@ -8,6 +8,8 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.user import UserAccount, UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/acl/acl_test.py b/dirsrvtests/tests/suites/acl/acl_test.py
index a501231..7acb094 100644
--- a/dirsrvtests/tests/suites/acl/acl_test.py
+++ b/dirsrvtests/tests/suites/acl/acl_test.py
@@ -18,6 +18,8 @@ from lib389.idm.organizationalrole import OrganizationalRole, OrganizationalRole
 from lib389.topologies import topology_m2
 from lib389._constants import SUFFIX, DN_SCHEMA, DN_DM, DEFAULT_SUFFIX, PASSWORD
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/acl/deladd_test.py b/dirsrvtests/tests/suites/acl/deladd_test.py
index 338a8af..25480fe 100644
--- a/dirsrvtests/tests/suites/acl/deladd_test.py
+++ b/dirsrvtests/tests/suites/acl/deladd_test.py
@@ -22,6 +22,8 @@ from lib389.idm.domain import Domain
 
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 
 USER_WITH_ACI_DELADD = 'uid=test_user_1000,ou=People,dc=example,dc=com'
 USER_DELADD = 'uid=test_user_1,ou=Accounting,dc=example,dc=com'
diff --git a/dirsrvtests/tests/suites/acl/enhanced_aci_modrnd_test.py b/dirsrvtests/tests/suites/acl/enhanced_aci_modrnd_test.py
index 69290e9..ca94569 100644
--- a/dirsrvtests/tests/suites/acl/enhanced_aci_modrnd_test.py
+++ b/dirsrvtests/tests/suites/acl/enhanced_aci_modrnd_test.py
@@ -11,6 +11,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/acl/globalgroup_part2_test.py b/dirsrvtests/tests/suites/acl/globalgroup_part2_test.py
index e30c49b..b10fb1b 100644
--- a/dirsrvtests/tests/suites/acl/globalgroup_part2_test.py
+++ b/dirsrvtests/tests/suites/acl/globalgroup_part2_test.py
@@ -15,6 +15,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 NESTEDGROUP_OU_GLOBAL = "ou=nestedgroup, {}".format(DEFAULT_SUFFIX)
 DEEPUSER_GLOBAL = "uid=DEEPUSER_GLOBAL, {}".format(NESTEDGROUP_OU_GLOBAL)
diff --git a/dirsrvtests/tests/suites/acl/globalgroup_test.py b/dirsrvtests/tests/suites/acl/globalgroup_test.py
index fd2b187..58c4392 100644
--- a/dirsrvtests/tests/suites/acl/globalgroup_test.py
+++ b/dirsrvtests/tests/suites/acl/globalgroup_test.py
@@ -15,6 +15,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 ACLGROUP_OU_GLOBAL = "ou=ACLGroup,{}".format(DEFAULT_SUFFIX)
 NESTEDGROUP_OU_GLOBAL = "ou=nestedgroup, {}".format(DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/suites/acl/keywords_part2_test.py b/dirsrvtests/tests/suites/acl/keywords_part2_test.py
index b456c57..272018a 100644
--- a/dirsrvtests/tests/suites/acl/keywords_part2_test.py
+++ b/dirsrvtests/tests/suites/acl/keywords_part2_test.py
@@ -23,6 +23,8 @@ from lib389.idm.user import UserAccount
 
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 
 KEYWORDS_OU_KEY = "ou=Keywords,{}".format(DEFAULT_SUFFIX)
 DAYOFWEEK_OU_KEY = "ou=Dayofweek,{}".format(KEYWORDS_OU_KEY)
diff --git a/dirsrvtests/tests/suites/acl/keywords_test.py b/dirsrvtests/tests/suites/acl/keywords_test.py
index 9c00d42..c8c1912 100644
--- a/dirsrvtests/tests/suites/acl/keywords_test.py
+++ b/dirsrvtests/tests/suites/acl/keywords_test.py
@@ -22,6 +22,7 @@ from lib389.idm.user import UserAccount
 
 import ldap
 
+pytestmark = pytest.mark.tier1
 
 KEYWORDS_OU_KEY = "ou=Keywords,{}".format(DEFAULT_SUFFIX)
 DNS_OU_KEY = "ou=DNS,{}".format(KEYWORDS_OU_KEY)
diff --git a/dirsrvtests/tests/suites/acl/misc_test.py b/dirsrvtests/tests/suites/acl/misc_test.py
index 8394c92..ab7f4d1 100644
--- a/dirsrvtests/tests/suites/acl/misc_test.py
+++ b/dirsrvtests/tests/suites/acl/misc_test.py
@@ -23,6 +23,7 @@ from lib389.plugins import ACLPlugin
 
 import ldap
 
+pytestmark = pytest.mark.tier1
 
 PEOPLE = "ou=PEOPLE,{}".format(DEFAULT_SUFFIX)
 DYNGROUP = "cn=DYNGROUP,{}".format(PEOPLE)
diff --git a/dirsrvtests/tests/suites/acl/modify_test.py b/dirsrvtests/tests/suites/acl/modify_test.py
index 8f9054b..cee5122 100644
--- a/dirsrvtests/tests/suites/acl/modify_test.py
+++ b/dirsrvtests/tests/suites/acl/modify_test.py
@@ -17,6 +17,7 @@ from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/suites/acl/modrdn_test.py b/dirsrvtests/tests/suites/acl/modrdn_test.py
index c395e0b..f67f3e5 100644
--- a/dirsrvtests/tests/suites/acl/modrdn_test.py
+++ b/dirsrvtests/tests/suites/acl/modrdn_test.py
@@ -15,6 +15,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit, OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/suites/acl/repeated_ldap_add_test.py b/dirsrvtests/tests/suites/acl/repeated_ldap_add_test.py
index 9225f8f..dc09f9f 100644
--- a/dirsrvtests/tests/suites/acl/repeated_ldap_add_test.py
+++ b/dirsrvtests/tests/suites/acl/repeated_ldap_add_test.py
@@ -16,6 +16,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DN_DM, DEFAULT_SUFFIX, PASSWORD, SERVERID_STANDALONE
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/acl/search_real_part2_test.py b/dirsrvtests/tests/suites/acl/search_real_part2_test.py
index 9a211da..a01e0ce 100644
--- a/dirsrvtests/tests/suites/acl/search_real_part2_test.py
+++ b/dirsrvtests/tests/suites/acl/search_real_part2_test.py
@@ -14,6 +14,7 @@ from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
@@ -452,4 +453,4 @@ def test_deny_all_access_with_targetfilter_using_presence_search(
 
 if __name__ == "__main__":
     CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s -v %s" % CURRENT_FILE)
\ No newline at end of file
+    pytest.main("-s -v %s" % CURRENT_FILE)
diff --git a/dirsrvtests/tests/suites/acl/search_real_part3_test.py b/dirsrvtests/tests/suites/acl/search_real_part3_test.py
index c14b5bd..9903a9f 100644
--- a/dirsrvtests/tests/suites/acl/search_real_part3_test.py
+++ b/dirsrvtests/tests/suites/acl/search_real_part3_test.py
@@ -17,6 +17,7 @@ from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
@@ -465,4 +466,4 @@ def test_groupdnattr_value_is_another_group(topo):
 
 if __name__ == "__main__":
     CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s -v %s" % CURRENT_FILE)
\ No newline at end of file
+    pytest.main("-s -v %s" % CURRENT_FILE)
diff --git a/dirsrvtests/tests/suites/acl/search_real_test.py b/dirsrvtests/tests/suites/acl/search_real_test.py
index f12d14a..e2b8ff4 100644
--- a/dirsrvtests/tests/suites/acl/search_real_test.py
+++ b/dirsrvtests/tests/suites/acl/search_real_test.py
@@ -16,6 +16,7 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 from lib389.idm.posixgroup import PosixGroups
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/suites/acl/selfdn_permissions_test.py b/dirsrvtests/tests/suites/acl/selfdn_permissions_test.py
index 6858ca7..af75013 100644
--- a/dirsrvtests/tests/suites/acl/selfdn_permissions_test.py
+++ b/dirsrvtests/tests/suites/acl/selfdn_permissions_test.py
@@ -19,7 +19,8 @@ log = logging.getLogger(__name__)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")]
 OC_NAME = 'OCticket47653'
 MUST = "(postalAddress $ postalCode)"
 MAY = "(member $ street)"
diff --git a/dirsrvtests/tests/suites/acl/syntax_test.py b/dirsrvtests/tests/suites/acl/syntax_test.py
index 1f48f97..169dc28 100644
--- a/dirsrvtests/tests/suites/acl/syntax_test.py
+++ b/dirsrvtests/tests/suites/acl/syntax_test.py
@@ -17,6 +17,8 @@ from lib389.topologies import topology_st as topo
 
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 INVALID = [('test_targattrfilters_1',
             f'(targattrfilters ="add=title:title=fred),del=cn:(cn!=harry)")'
             f'(version 3.0; acl "Name of the ACI"; deny absolute (all)userdn="ldap:///anyone";)'),
diff --git a/dirsrvtests/tests/suites/acl/valueacl_part2_test.py b/dirsrvtests/tests/suites/acl/valueacl_part2_test.py
index 9716ec8..bb075ad 100644
--- a/dirsrvtests/tests/suites/acl/valueacl_part2_test.py
+++ b/dirsrvtests/tests/suites/acl/valueacl_part2_test.py
@@ -14,6 +14,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
@@ -428,4 +429,4 @@ def test_targattrfilters_keyword(topo):
 
 if __name__ == '__main__':
     CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s -v %s" % CURRENT_FILE)
\ No newline at end of file
+    pytest.main("-s -v %s" % CURRENT_FILE)
diff --git a/dirsrvtests/tests/suites/acl/valueacl_test.py b/dirsrvtests/tests/suites/acl/valueacl_test.py
index 950cdd1..1dfe212 100644
--- a/dirsrvtests/tests/suites/acl/valueacl_test.py
+++ b/dirsrvtests/tests/suites/acl/valueacl_test.py
@@ -14,6 +14,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/suites/attr_encryption/attr_encryption_test.py b/dirsrvtests/tests/suites/attr_encryption/attr_encryption_test.py
index ccf7eac..90df28c 100644
--- a/dirsrvtests/tests/suites/attr_encryption/attr_encryption_test.py
+++ b/dirsrvtests/tests/suites/attr_encryption/attr_encryption_test.py
@@ -17,6 +17,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.backend import Backends
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 USER_DN = 'uid=test_user,%s' % DEFAULT_SUFFIX
 
 logging.getLogger(__name__).setLevel(logging.INFO)
diff --git a/dirsrvtests/tests/suites/automember_plugin/automember_mod_test.py b/dirsrvtests/tests/suites/automember_plugin/automember_mod_test.py
index 4ba3bc8..13d96f3 100644
--- a/dirsrvtests/tests/suites/automember_plugin/automember_mod_test.py
+++ b/dirsrvtests/tests/suites/automember_plugin/automember_mod_test.py
@@ -9,7 +9,8 @@ from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.4.0'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.4.0'), reason="Not implemented")]
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
diff --git a/dirsrvtests/tests/suites/automember_plugin/automember_test.py b/dirsrvtests/tests/suites/automember_plugin/automember_test.py
index 1659ab6..3d5afd9 100644
--- a/dirsrvtests/tests/suites/automember_plugin/automember_test.py
+++ b/dirsrvtests/tests/suites/automember_plugin/automember_test.py
@@ -14,7 +14,8 @@ from lib389._constants import DEFAULT_SUFFIX
 
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")]
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
diff --git a/dirsrvtests/tests/suites/basic/basic_test.py b/dirsrvtests/tests/suites/basic/basic_test.py
index e3c64a4..457e808 100644
--- a/dirsrvtests/tests/suites/basic/basic_test.py
+++ b/dirsrvtests/tests/suites/basic/basic_test.py
@@ -25,6 +25,7 @@ from lib389.paths import Paths
 from lib389.idm.directorymanager import DirectoryManager
 from lib389.config import LDBMConfig
 
+pytestmark = pytest.mark.tier0
 
 default_paths = Paths()
 
diff --git a/dirsrvtests/tests/suites/betxns/betxn_test.py b/dirsrvtests/tests/suites/betxns/betxn_test.py
index 94e6081..ee160df 100644
--- a/dirsrvtests/tests/suites/betxns/betxn_test.py
+++ b/dirsrvtests/tests/suites/betxns/betxn_test.py
@@ -20,6 +20,8 @@ from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.idm.group import Groups, Group
 from lib389._constants import DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/clu/clu_test.py b/dirsrvtests/tests/suites/clu/clu_test.py
index ea2cb4b..fec6915 100644
--- a/dirsrvtests/tests/suites/clu/clu_test.py
+++ b/dirsrvtests/tests/suites/clu/clu_test.py
@@ -13,6 +13,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier0
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/config/autotuning_test.py b/dirsrvtests/tests/suites/config/autotuning_test.py
index 012db5e..ef36d19 100644
--- a/dirsrvtests/tests/suites/config/autotuning_test.py
+++ b/dirsrvtests/tests/suites/config/autotuning_test.py
@@ -13,6 +13,8 @@ from lib389.topologies import topology_st as topo
 
 from lib389._constants import DN_CONFIG_LDBM, DN_USERROOT_LDBM, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier0
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/config/config_test.py b/dirsrvtests/tests/suites/config/config_test.py
index 764f734..860919e 100644
--- a/dirsrvtests/tests/suites/config/config_test.py
+++ b/dirsrvtests/tests/suites/config/config_test.py
@@ -20,6 +20,8 @@ from lib389.cos import CosPointerDefinitions, CosTemplates
 from lib389.backend import Backends
 from lib389.monitor import MonitorLDBM
 
+pytestmark = pytest.mark.tier0
+
 USER_DN = 'uid=test_user,%s' % DEFAULT_SUFFIX
 
 logging.getLogger(__name__).setLevel(logging.INFO)
diff --git a/dirsrvtests/tests/suites/config/regression_test.py b/dirsrvtests/tests/suites/config/regression_test.py
index a7a31b4..bbe4c51 100644
--- a/dirsrvtests/tests/suites/config/regression_test.py
+++ b/dirsrvtests/tests/suites/config/regression_test.py
@@ -14,6 +14,8 @@ from lib389.config import LDBMConfig
 from lib389.backend import Backends
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier0
+
 logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/config/removed_config_49298_test.py b/dirsrvtests/tests/suites/config/removed_config_49298_test.py
index 7cf0f20..7b585b4 100644
--- a/dirsrvtests/tests/suites/config/removed_config_49298_test.py
+++ b/dirsrvtests/tests/suites/config/removed_config_49298_test.py
@@ -13,6 +13,8 @@ import subprocess
 
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier0
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/cos/cos_test.py b/dirsrvtests/tests/suites/cos/cos_test.py
index 6a24537..a8907d1 100644
--- a/dirsrvtests/tests/suites/cos/cos_test.py
+++ b/dirsrvtests/tests/suites/cos/cos_test.py
@@ -14,6 +14,7 @@ from lib389.idm.role import FilterRoles
 from lib389.idm.nscontainer import nsContainer
 from lib389.idm.user import UserAccount
 
+pytestmark = pytest.mark.tier1
 
 def test_positive(topo):
     """
diff --git a/dirsrvtests/tests/suites/cos/indirect_cos_test.py b/dirsrvtests/tests/suites/cos/indirect_cos_test.py
index 452edcd..4689297 100644
--- a/dirsrvtests/tests/suites/cos/indirect_cos_test.py
+++ b/dirsrvtests/tests/suites/cos/indirect_cos_test.py
@@ -12,6 +12,7 @@ from lib389.topologies import topology_st as topo
 from lib389._constants import (DEFAULT_SUFFIX, DN_DM, PASSWORD, HOST_STANDALONE,
                                SERVERID_STANDALONE, PORT_STANDALONE)
 
+pytestmark = pytest.mark.tier1
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
diff --git a/dirsrvtests/tests/suites/disk_monitoring/disk_monitoring_test.py b/dirsrvtests/tests/suites/disk_monitoring/disk_monitoring_test.py
index 08cb159..81b31e2 100644
--- a/dirsrvtests/tests/suites/disk_monitoring/disk_monitoring_test.py
+++ b/dirsrvtests/tests/suites/disk_monitoring/disk_monitoring_test.py
@@ -19,6 +19,7 @@ from lib389.topologies import topology_st as topo
 from lib389.paths import *
 from lib389.idm.user import UserAccounts
 
+pytestmark = pytest.mark.tier2
 
 THRESHOLD = '30'
 THRESHOLD_BYTES = '30000000'
diff --git a/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py b/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
index d54d793..4d3dd59 100644
--- a/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
+++ b/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
@@ -17,6 +17,7 @@ from lib389.idm.user import UserAccounts
 from lib389.idm.group import Groups
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/suites/ds_logs/regression_test.py b/dirsrvtests/tests/suites/ds_logs/regression_test.py
index 07ba3e3..c3c157d 100644
--- a/dirsrvtests/tests/suites/ds_logs/regression_test.py
+++ b/dirsrvtests/tests/suites/ds_logs/regression_test.py
@@ -13,6 +13,8 @@ from lib389._constants import DN_CONFIG, LOG_REPLICA, LOG_DEFAULT, LOG_TRACE, LO
 from lib389.utils import os, logging
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/ds_tools/logpipe_test.py b/dirsrvtests/tests/suites/ds_tools/logpipe_test.py
index e7bc7fb..3e18ba2 100644
--- a/dirsrvtests/tests/suites/ds_tools/logpipe_test.py
+++ b/dirsrvtests/tests/suites/ds_tools/logpipe_test.py
@@ -11,6 +11,8 @@ import subprocess
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/ds_tools/replcheck_test.py b/dirsrvtests/tests/suites/ds_tools/replcheck_test.py
index 27b8c31..63c80a0 100644
--- a/dirsrvtests/tests/suites/ds_tools/replcheck_test.py
+++ b/dirsrvtests/tests/suites/ds_tools/replcheck_test.py
@@ -17,6 +17,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.services import ServiceAccounts
 from lib389.topologies import topology_m2 as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py b/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py
index 3a66f02..89098b5 100644
--- a/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py
+++ b/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py
@@ -23,6 +23,8 @@ from lib389.topologies import topology_m2
 from ..plugins import acceptance_test
 from . import stress_tests
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/suites/dynamic_plugins/stress_tests.py b/dirsrvtests/tests/suites/dynamic_plugins/stress_tests.py
index 05c642a..0f62b4f 100644
--- a/dirsrvtests/tests/suites/dynamic_plugins/stress_tests.py
+++ b/dirsrvtests/tests/suites/dynamic_plugins/stress_tests.py
@@ -15,6 +15,7 @@ import logging
 import threading
 
 import ldap
+import pytest
 from lib389 import Entry
 from lib389._constants import *
 from lib389.properties import *
@@ -22,6 +23,8 @@ from lib389.plugins import ReferentialIntegrityPlugin, MemberOfPlugin
 from lib389.utils import *
 from lib389.idm.directorymanager import *
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 NUM_USERS = 250
diff --git a/dirsrvtests/tests/suites/filter/basic_filter_test.py b/dirsrvtests/tests/suites/filter/basic_filter_test.py
index 5c5a3aa..0fca56f 100644
--- a/dirsrvtests/tests/suites/filter/basic_filter_test.py
+++ b/dirsrvtests/tests/suites/filter/basic_filter_test.py
@@ -14,6 +14,7 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.user import UserAccount, UserAccounts
 from lib389.idm.account import Accounts
 
+pytestmark = pytest.mark.tier0
 
 def test_search_attr(topo):
     """
diff --git a/dirsrvtests/tests/suites/filter/complex_filters_test.py b/dirsrvtests/tests/suites/filter/complex_filters_test.py
index 3f22aa2..37d7688 100644
--- a/dirsrvtests/tests/suites/filter/complex_filters_test.py
+++ b/dirsrvtests/tests/suites/filter/complex_filters_test.py
@@ -6,6 +6,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st as topo
 from lib389.idm.user import UserAccounts
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/filter/filter_logic_test.py b/dirsrvtests/tests/suites/filter/filter_logic_test.py
index 130ff2d..d600916 100644
--- a/dirsrvtests/tests/suites/filter/filter_logic_test.py
+++ b/dirsrvtests/tests/suites/filter/filter_logic_test.py
@@ -15,6 +15,8 @@ from lib389._constants import DEFAULT_SUFFIX
 
 from lib389.idm.user import UserAccounts
 
+pytestmark = pytest.mark.tier1
+
 """
 This test case asserts that various logical filters apply correctly and as expected.
 This is to assert that we have correct and working search operations, especially related
diff --git a/dirsrvtests/tests/suites/filter/filter_test.py b/dirsrvtests/tests/suites/filter/filter_test.py
index abe9257..08521c4 100644
--- a/dirsrvtests/tests/suites/filter/filter_test.py
+++ b/dirsrvtests/tests/suites/filter/filter_test.py
@@ -14,6 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import PASSWORD, DEFAULT_SUFFIX, DN_DM, SUFFIX
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/filter/rfc3673_all_oper_attrs_test.py b/dirsrvtests/tests/suites/filter/rfc3673_all_oper_attrs_test.py
index 67bbda4..355b3f4 100644
--- a/dirsrvtests/tests/suites/filter/rfc3673_all_oper_attrs_test.py
+++ b/dirsrvtests/tests/suites/filter/rfc3673_all_oper_attrs_test.py
@@ -14,6 +14,8 @@ from lib389.idm.user import UserAccounts
 
 from lib389._constants import DN_DM, DEFAULT_SUFFIX, DN_CONFIG, PASSWORD
 
+pytestmark = pytest.mark.tier1
+
 DN_PEOPLE = 'ou=people,%s' % DEFAULT_SUFFIX
 DN_ROOT = ''
 TEST_USER_NAME = 'all_attrs_test'
diff --git a/dirsrvtests/tests/suites/fourwaymmr/fourwaymmr_test.py b/dirsrvtests/tests/suites/fourwaymmr/fourwaymmr_test.py
index e3c8acd..e65bec1 100644
--- a/dirsrvtests/tests/suites/fourwaymmr/fourwaymmr_test.py
+++ b/dirsrvtests/tests/suites/fourwaymmr/fourwaymmr_test.py
@@ -15,6 +15,7 @@ from lib389.replica import *
 from lib389.idm.user import UserAccounts
 from lib389.agreement import *
 
+pytestmark = pytest.mark.tier2
 
 @pytest.fixture(scope="function")
 def _cleanupentris(request, topo_m4):
diff --git a/dirsrvtests/tests/suites/get_effective_rights/acceptance_test.py b/dirsrvtests/tests/suites/get_effective_rights/acceptance_test.py
index fdf0e57..139f996 100644
--- a/dirsrvtests/tests/suites/get_effective_rights/acceptance_test.py
+++ b/dirsrvtests/tests/suites/get_effective_rights/acceptance_test.py
@@ -8,6 +8,8 @@ from lib389.topologies import topology_st as topo
 from lib389._constants import *
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier1
+
 TEST_ENTRY_NAME = 'testuser'
 TEST_GROUP_NAME = 'group1'
 TEST_GROUP2_NAME = 'group1'
diff --git a/dirsrvtests/tests/suites/gssapi/simple_gssapi_test.py b/dirsrvtests/tests/suites/gssapi/simple_gssapi_test.py
index 9a881cb..7f66a2a 100644
--- a/dirsrvtests/tests/suites/gssapi/simple_gssapi_test.py
+++ b/dirsrvtests/tests/suites/gssapi/simple_gssapi_test.py
@@ -18,7 +18,7 @@ import subprocess
 import os
 import pytest
 
-
+pytestmark = pytest.mark.tier1
 
 @pytest.fixture(scope='module')
 def testuser(topology_st_gssapi):
diff --git a/dirsrvtests/tests/suites/gssapi_repl/gssapi_repl_test.py b/dirsrvtests/tests/suites/gssapi_repl/gssapi_repl_test.py
index 5fde51b..5ffdc6b 100644
--- a/dirsrvtests/tests/suites/gssapi_repl/gssapi_repl_test.py
+++ b/dirsrvtests/tests/suites/gssapi_repl/gssapi_repl_test.py
@@ -11,6 +11,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_m2
 
+pytestmark = pytest.mark.tier2
+
 #########################################
 #
 # WARNING!!!!! If this test is failing, and your here to find out why, the
diff --git a/dirsrvtests/tests/suites/import/regression_test.py b/dirsrvtests/tests/suites/import/regression_test.py
index 55ce3ca..43581c7 100644
--- a/dirsrvtests/tests/suites/import/regression_test.py
+++ b/dirsrvtests/tests/suites/import/regression_test.py
@@ -14,6 +14,8 @@ from lib389._constants import BACKEND_NAME, BACKEND_SUFFIX
 
 from lib389.dbgen import dbgen
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/lib389/config_compare_test.py b/dirsrvtests/tests/suites/lib389/config_compare_test.py
index 2201609..709bae8 100644
--- a/dirsrvtests/tests/suites/lib389/config_compare_test.py
+++ b/dirsrvtests/tests/suites/lib389/config_compare_test.py
@@ -4,6 +4,8 @@ import pytest
 from lib389.topologies import topology_i2
 from lib389.config import Config
 
+pytestmark = pytest.mark.tier1
+
 def test_config_compare(topology_i2):
     """
     Compare test between cn=config of two different Directory Server intance.
diff --git a/dirsrvtests/tests/suites/lib389/dsldapobject/dn_construct_test.py b/dirsrvtests/tests/suites/lib389/dsldapobject/dn_construct_test.py
index f5d306a..86d0a0d 100644
--- a/dirsrvtests/tests/suites/lib389/dsldapobject/dn_construct_test.py
+++ b/dirsrvtests/tests/suites/lib389/dsldapobject/dn_construct_test.py
@@ -15,6 +15,8 @@ from lib389.topologies import topology_st
 
 from lib389.idm.group import Groups, Group
 
+pytestmark = pytest.mark.tier1
+
 #################################################################################
 # This is a series of test cases to assert that various DN construction scenarios
 # work as expected in lib389.
diff --git a/dirsrvtests/tests/suites/lib389/idm/user_compare_i2_test.py b/dirsrvtests/tests/suites/lib389/idm/user_compare_i2_test.py
index 994ced0..c7540e4 100644
--- a/dirsrvtests/tests/suites/lib389/idm/user_compare_i2_test.py
+++ b/dirsrvtests/tests/suites/lib389/idm/user_compare_i2_test.py
@@ -4,6 +4,8 @@ from lib389._constants import DEFAULT_SUFFIX
 from lib389.idm.user import UserAccounts, UserAccount
 from lib389.topologies import topology_i2
 
+pytestmark = pytest.mark.tier1
+
 def test_user_compare_i2(topology_i2):
     """
     Compare test between users of two different Directory Server intances.
diff --git a/dirsrvtests/tests/suites/lib389/idm/user_compare_m2Repl_test.py b/dirsrvtests/tests/suites/lib389/idm/user_compare_m2Repl_test.py
index 68c317d..ab4fe3d 100644
--- a/dirsrvtests/tests/suites/lib389/idm/user_compare_m2Repl_test.py
+++ b/dirsrvtests/tests/suites/lib389/idm/user_compare_m2Repl_test.py
@@ -5,6 +5,7 @@ from lib389.replica import ReplicationManager
 from lib389.idm.user import UserAccounts, UserAccount
 from lib389.topologies import topology_m2
 
+pytestmark = pytest.mark.tier1
 
 def test_user_compare_m2Repl(topology_m2):
     """
diff --git a/dirsrvtests/tests/suites/lib389/idm/user_compare_st_test.py b/dirsrvtests/tests/suites/lib389/idm/user_compare_st_test.py
index 70a8233..4703bb4 100644
--- a/dirsrvtests/tests/suites/lib389/idm/user_compare_st_test.py
+++ b/dirsrvtests/tests/suites/lib389/idm/user_compare_st_test.py
@@ -5,6 +5,7 @@ from lib389.idm.group import Groups
 from lib389.idm.user import UserAccounts, UserAccount
 from lib389.topologies import topology_st as topology
 
+pytestmark = pytest.mark.tier1
 
 def test_user_compare(topology):
     """
diff --git a/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py b/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py
index 53acfe0..a29b33f 100644
--- a/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py
+++ b/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py
@@ -16,6 +16,8 @@ from lib389.idm.user import (TEST_USER_PROPERTIES, UserAccounts)
 
 from lib389.dbgen import dbgen
 
+pytestmark = pytest.mark.tier1
+
 def test_referral_during_tot(topology_m2):
 
     master1 = topology_m2.ms["master1"]
diff --git a/dirsrvtests/tests/suites/memberof_plugin/regression_test.py b/dirsrvtests/tests/suites/memberof_plugin/regression_test.py
index 9d0ce35..f3a32f5 100644
--- a/dirsrvtests/tests/suites/memberof_plugin/regression_test.py
+++ b/dirsrvtests/tests/suites/memberof_plugin/regression_test.py
@@ -25,7 +25,8 @@ from lib389.idm.nscontainer import nsContainers
 
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")]
 
 USER_CN = 'user_'
 GROUP_CN = 'group1'
diff --git a/dirsrvtests/tests/suites/memory_leaks/range_search_test.py b/dirsrvtests/tests/suites/memory_leaks/range_search_test.py
index dc3ac24..f228ba2 100644
--- a/dirsrvtests/tests/suites/memory_leaks/range_search_test.py
+++ b/dirsrvtests/tests/suites/memory_leaks/range_search_test.py
@@ -13,6 +13,8 @@ from lib389.paths import Paths
 from lib389.topologies import topology_st
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/monitor/monitor_test.py b/dirsrvtests/tests/suites/monitor/monitor_test.py
index 5c53021..5786903 100644
--- a/dirsrvtests/tests/suites/monitor/monitor_test.py
+++ b/dirsrvtests/tests/suites/monitor/monitor_test.py
@@ -12,6 +12,7 @@ else:
     logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 
+pytestmark = pytest.mark.tier1
 def test_monitor(topo):
     """This test is to display monitor attributes to check the performace
 
diff --git a/dirsrvtests/tests/suites/paged_results/paged_results_test.py b/dirsrvtests/tests/suites/paged_results/paged_results_test.py
index e016976..6521ab1 100644
--- a/dirsrvtests/tests/suites/paged_results/paged_results_test.py
+++ b/dirsrvtests/tests/suites/paged_results/paged_results_test.py
@@ -25,6 +25,8 @@ from lib389.backend import Backends
 
 from lib389._mapped_object import DSLdapObject
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 if DEBUGGING:
diff --git a/dirsrvtests/tests/suites/password/password_test.py b/dirsrvtests/tests/suites/password/password_test.py
index 5ae44f3..3807947 100644
--- a/dirsrvtests/tests/suites/password/password_test.py
+++ b/dirsrvtests/tests/suites/password/password_test.py
@@ -15,6 +15,8 @@ from lib389._constants import PASSWORD, DEFAULT_SUFFIX
 
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/password/pbkdf2_upgrade_plugin_test.py b/dirsrvtests/tests/suites/password/pbkdf2_upgrade_plugin_test.py
index 3e29eb9..ca69fb4 100644
--- a/dirsrvtests/tests/suites/password/pbkdf2_upgrade_plugin_test.py
+++ b/dirsrvtests/tests/suites/password/pbkdf2_upgrade_plugin_test.py
@@ -10,6 +10,8 @@ import pytest
 from lib389.topologies import topology_st
 from lib389.password_plugins import PBKDF2Plugin
 
+pytestmark = pytest.mark.tier1
+
 def test_pbkdf2_upgrade(topology_st):
     """On upgrade pbkdf2 doesn't ship. We need to be able to
     provide this on upgrade to make sure default hashes work.
diff --git a/dirsrvtests/tests/suites/password/pwdAdmin_test.py b/dirsrvtests/tests/suites/password/pwdAdmin_test.py
index 0154f46..16869d4 100644
--- a/dirsrvtests/tests/suites/password/pwdAdmin_test.py
+++ b/dirsrvtests/tests/suites/password/pwdAdmin_test.py
@@ -17,6 +17,8 @@ from lib389.idm.domain import Domain
 
 from lib389._constants import SUFFIX, DN_DM, PASSWORD, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/password/pwdModify_test.py b/dirsrvtests/tests/suites/password/pwdModify_test.py
index 3e8d3bf..9e32823 100644
--- a/dirsrvtests/tests/suites/password/pwdModify_test.py
+++ b/dirsrvtests/tests/suites/password/pwdModify_test.py
@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.pwpolicy import PwPolicyManager
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/password/pwdPolicy_attribute_test.py b/dirsrvtests/tests/suites/password/pwdPolicy_attribute_test.py
index 1c0dab1..ec8fc6d 100644
--- a/dirsrvtests/tests/suites/password/pwdPolicy_attribute_test.py
+++ b/dirsrvtests/tests/suites/password/pwdPolicy_attribute_test.py
@@ -15,6 +15,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389._constants import (DEFAULT_SUFFIX, DN_DM, PASSWORD)
 
+pytestmark = pytest.mark.tier1
+
 OU_PEOPLE = 'ou=people,{}'.format(DEFAULT_SUFFIX)
 TEST_USER_NAME = 'simplepaged_test'
 TEST_USER_DN = 'uid={},{}'.format(TEST_USER_NAME, OU_PEOPLE)
diff --git a/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py b/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py
index 0819854..0756b3e 100644
--- a/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py
+++ b/dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py
@@ -9,6 +9,7 @@ from lib389.idm.user import UserAccounts
 from lib389._constants import (DN_DM, PASSWORD, DEFAULT_SUFFIX)
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
diff --git a/dirsrvtests/tests/suites/password/pwdPolicy_inherit_global_test.py b/dirsrvtests/tests/suites/password/pwdPolicy_inherit_global_test.py
index e8f531d..2f85f62 100644
--- a/dirsrvtests/tests/suites/password/pwdPolicy_inherit_global_test.py
+++ b/dirsrvtests/tests/suites/password/pwdPolicy_inherit_global_test.py
@@ -18,6 +18,8 @@ from lib389.topologies import topology_st
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/password/pwdPolicy_syntax_test.py b/dirsrvtests/tests/suites/password/pwdPolicy_syntax_test.py
index 4b93307..82d1a97 100644
--- a/dirsrvtests/tests/suites/password/pwdPolicy_syntax_test.py
+++ b/dirsrvtests/tests/suites/password/pwdPolicy_syntax_test.py
@@ -16,6 +16,7 @@ from lib389._constants import DEFAULT_SUFFIX, PASSWORD, DN_DM
 from lib389.idm.user import UserAccounts
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
 
 USER_DN = 'uid=user,ou=People,%s' % DEFAULT_SUFFIX
 USER_RDN = 'user'
diff --git a/dirsrvtests/tests/suites/password/pwdPolicy_token_test.py b/dirsrvtests/tests/suites/password/pwdPolicy_token_test.py
index b0bab20..bf49506 100644
--- a/dirsrvtests/tests/suites/password/pwdPolicy_token_test.py
+++ b/dirsrvtests/tests/suites/password/pwdPolicy_token_test.py
@@ -8,6 +8,8 @@ from lib389.idm.user import UserAccounts
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/password/pwdPolicy_warning_test.py b/dirsrvtests/tests/suites/password/pwdPolicy_warning_test.py
index eb28b71..3ba4f52 100644
--- a/dirsrvtests/tests/suites/password/pwdPolicy_warning_test.py
+++ b/dirsrvtests/tests/suites/password/pwdPolicy_warning_test.py
@@ -19,6 +19,8 @@ from lib389._constants import (DEFAULT_SUFFIX, DN_CONFIG, PASSWORD, DN_DM,
 from dateutil.parser import parse as dt_parse
 import datetime
 
+pytestmark = pytest.mark.tier1
+
 CONFIG_ATTR = 'passwordSendExpiringTime'
 USER_DN = 'uid=tuser,ou=people,{}'.format(DEFAULT_SUFFIX)
 USER_RDN = 'tuser'
diff --git a/dirsrvtests/tests/suites/password/pwd_algo_test.py b/dirsrvtests/tests/suites/password/pwd_algo_test.py
index 77c549a..191c898 100644
--- a/dirsrvtests/tests/suites/password/pwd_algo_test.py
+++ b/dirsrvtests/tests/suites/password/pwd_algo_test.py
@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, HOST_STANDALONE, PORT_STANDALONE
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 USER_DN = 'uid=user,ou=People,%s' % DEFAULT_SUFFIX
 
diff --git a/dirsrvtests/tests/suites/password/pwd_lockout_bypass_test.py b/dirsrvtests/tests/suites/password/pwd_lockout_bypass_test.py
index 1a0aef1..a4e0094 100644
--- a/dirsrvtests/tests/suites/password/pwd_lockout_bypass_test.py
+++ b/dirsrvtests/tests/suites/password/pwd_lockout_bypass_test.py
@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 # The irony of these names is not lost on me.
 GOOD_PASSWORD = 'password'
 BAD_PASSWORD = 'aontseunao'
diff --git a/dirsrvtests/tests/suites/password/pwd_log_test.py b/dirsrvtests/tests/suites/password/pwd_log_test.py
index 1bf1b50..1fabf2c 100644
--- a/dirsrvtests/tests/suites/password/pwd_log_test.py
+++ b/dirsrvtests/tests/suites/password/pwd_log_test.py
@@ -14,6 +14,8 @@ from lib389.topologies import topology_st
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389._constants import DN_CONFIG, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/password/pwp_history_test.py b/dirsrvtests/tests/suites/password/pwp_history_test.py
index 4580d7c..7fe3e0a 100644
--- a/dirsrvtests/tests/suites/password/pwp_history_test.py
+++ b/dirsrvtests/tests/suites/password/pwp_history_test.py
@@ -15,6 +15,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389._constants import DN_DM, DEFAULT_SUFFIX, PASSWORD
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/password/regression_test.py b/dirsrvtests/tests/suites/password/regression_test.py
index 7afce41..b01b73e 100644
--- a/dirsrvtests/tests/suites/password/regression_test.py
+++ b/dirsrvtests/tests/suites/password/regression_test.py
@@ -13,6 +13,8 @@ from lib389.utils import ldap, os, logging
 from lib389.topologies import topology_st as topo
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/plugins/acceptance_test.py b/dirsrvtests/tests/suites/plugins/acceptance_test.py
index f44b684..21fa786 100644
--- a/dirsrvtests/tests/suites/plugins/acceptance_test.py
+++ b/dirsrvtests/tests/suites/plugins/acceptance_test.py
@@ -24,6 +24,8 @@ from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.idm.domain import Domain
 from lib389.topologies import create_topology, topology_i2 as topo
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 USER_DN = 'uid=test_user_1001,ou=people,dc=example,dc=com'
diff --git a/dirsrvtests/tests/suites/plugins/accpol_test.py b/dirsrvtests/tests/suites/plugins/accpol_test.py
index 69e4500..ac63739 100644
--- a/dirsrvtests/tests/suites/plugins/accpol_test.py
+++ b/dirsrvtests/tests/suites/plugins/accpol_test.py
@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccounts
 from lib389._constants import (PLUGIN_ACCT_POLICY, DN_PLUGIN, DN_DM, PASSWORD, DEFAULT_SUFFIX,
                                DN_CONFIG, SERVERID_STANDALONE)
 
+pytestmark = pytest.mark.tier1
+
 LOCL_CONF = 'cn=AccountPolicy1,ou=people,dc=example,dc=com'
 TEMPL_COS = 'cn=TempltCoS,ou=people,dc=example,dc=com'
 DEFIN_COS = 'cn=DefnCoS,ou=people,dc=example,dc=com'
diff --git a/dirsrvtests/tests/suites/plugins/attr_nsslapd-pluginarg_test.py b/dirsrvtests/tests/suites/plugins/attr_nsslapd-pluginarg_test.py
index 4dee6a0..2afaa3d 100644
--- a/dirsrvtests/tests/suites/plugins/attr_nsslapd-pluginarg_test.py
+++ b/dirsrvtests/tests/suites/plugins/attr_nsslapd-pluginarg_test.py
@@ -14,7 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, DN_PLUGIN, SUFFIX, PLUGIN_7_BIT_CHECK
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/suites/plugins/cos_test.py b/dirsrvtests/tests/suites/plugins/cos_test.py
index c624e8f..82e29a0 100644
--- a/dirsrvtests/tests/suites/plugins/cos_test.py
+++ b/dirsrvtests/tests/suites/plugins/cos_test.py
@@ -20,6 +20,8 @@ from lib389.plugins import *
 from lib389._constants import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 def add_user(server, uid, testbase, locality=None, tel=None, title=None):
     dn = 'uid=%s,%s' % (uid, testbase)
     log.fatal('Adding user (%s): ' % dn)
diff --git a/dirsrvtests/tests/suites/plugins/dna_test.py b/dirsrvtests/tests/suites/plugins/dna_test.py
index 3418048..1a91a71 100644
--- a/dirsrvtests/tests/suites/plugins/dna_test.py
+++ b/dirsrvtests/tests/suites/plugins/dna_test.py
@@ -17,6 +17,8 @@ from lib389.idm.user import UserAccounts
 from lib389.topologies import topology_st
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/suites/plugins/memberof_test.py b/dirsrvtests/tests/suites/plugins/memberof_test.py
index c0e5809..bc99eef 100644
--- a/dirsrvtests/tests/suites/plugins/memberof_test.py
+++ b/dirsrvtests/tests/suites/plugins/memberof_test.py
@@ -12,6 +12,8 @@ from lib389.utils import *
 from lib389.topologies import topology_st
 from lib389._constants import PLUGIN_MEMBER_OF, SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/plugins/pluginpath_validation_test.py b/dirsrvtests/tests/suites/plugins/pluginpath_validation_test.py
index 5c66636..eb36d86 100644
--- a/dirsrvtests/tests/suites/plugins/pluginpath_validation_test.py
+++ b/dirsrvtests/tests/suites/plugins/pluginpath_validation_test.py
@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, PLUGIN_WHOAMI
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/plugins/referint_test.py b/dirsrvtests/tests/suites/plugins/referint_test.py
index 7198e6a..02b9857 100644
--- a/dirsrvtests/tests/suites/plugins/referint_test.py
+++ b/dirsrvtests/tests/suites/plugins/referint_test.py
@@ -22,6 +22,8 @@ from lib389.idm.user import UserAccounts, UserAccount
 from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 ESCAPED_RDN_BASE = "foo\\,oo"
diff --git a/dirsrvtests/tests/suites/plugins/rootdn_plugin_test.py b/dirsrvtests/tests/suites/plugins/rootdn_plugin_test.py
index c7bb15f..c93d589 100644
--- a/dirsrvtests/tests/suites/plugins/rootdn_plugin_test.py
+++ b/dirsrvtests/tests/suites/plugins/rootdn_plugin_test.py
@@ -17,6 +17,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import PLUGIN_ROOTDN_ACCESS, DN_CONFIG, DEFAULT_SUFFIX, DN_DM, PASSWORD, LOCALHOST_IP
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/psearch/psearch_test.py b/dirsrvtests/tests/suites/psearch/psearch_test.py
index 354f479..e80f272 100644
--- a/dirsrvtests/tests/suites/psearch/psearch_test.py
+++ b/dirsrvtests/tests/suites/psearch/psearch_test.py
@@ -13,6 +13,7 @@ from lib389.idm.group import Groups
 import ldap
 from ldap.controls.psearch import PersistentSearchControl,EntryChangeNotificationControl
 
+pytestmark = pytest.mark.tier1
 
 def _run_psearch(inst, msg_id):
     """Run a search with EntryChangeNotificationControl"""
diff --git a/dirsrvtests/tests/suites/referint_plugin/rename_test.py b/dirsrvtests/tests/suites/referint_plugin/rename_test.py
index 442c1a4..073dc15 100644
--- a/dirsrvtests/tests/suites/referint_plugin/rename_test.py
+++ b/dirsrvtests/tests/suites/referint_plugin/rename_test.py
@@ -7,7 +7,7 @@
 # --- END COPYRIGHT BLOCK ---
 #
 
-
+import pytest
 from lib389._constants import DEFAULT_SUFFIX
 from lib389.topologies import topology_m2
 
@@ -18,6 +18,8 @@ from lib389.idm.organizationalunit import OrganizationalUnit as OrganisationalUn
 
 from lib389.plugins import AutoMembershipPlugin, ReferentialIntegrityPlugin, AutoMembershipDefinitions, MemberOfPlugin
 
+pytestmark = pytest.mark.tier2
+
 UCOUNT = 400
 
 def _enable_plugins(inst, group_dn):
diff --git a/dirsrvtests/tests/suites/replication/acceptance_test.py b/dirsrvtests/tests/suites/replication/acceptance_test.py
index 79997d7..bf35ef3 100644
--- a/dirsrvtests/tests/suites/replication/acceptance_test.py
+++ b/dirsrvtests/tests/suites/replication/acceptance_test.py
@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccount
 from lib389.replica import ReplicationManager
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier0
+
 TEST_ENTRY_NAME = 'mmrepl_test'
 TEST_ENTRY_DN = 'uid={},{}'.format(TEST_ENTRY_NAME, DEFAULT_SUFFIX)
 NEW_SUFFIX_NAME = 'test_repl'
diff --git a/dirsrvtests/tests/suites/replication/cascading_test.py b/dirsrvtests/tests/suites/replication/cascading_test.py
index 7331f20..5bf4fcb 100644
--- a/dirsrvtests/tests/suites/replication/cascading_test.py
+++ b/dirsrvtests/tests/suites/replication/cascading_test.py
@@ -18,6 +18,8 @@ from lib389.idm.user import UserAccount, TEST_USER_PROPERTIES
 from lib389.idm.group import Groups
 from lib389.topologies import topology_m1h1c1 as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/replication/changelog_test.py b/dirsrvtests/tests/suites/replication/changelog_test.py
old mode 100755
new mode 100644
index b4ae7c6..a257e02
--- a/dirsrvtests/tests/suites/replication/changelog_test.py
+++ b/dirsrvtests/tests/suites/replication/changelog_test.py
@@ -19,6 +19,8 @@ from lib389._constants import *
 from lib389.tasks import *
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier1
+
 TEST_ENTRY_NAME = 'replusr'
 NEW_RDN_NAME = 'cl5usr'
 CHANGELOG = 'cn=changelog5,cn=config'
diff --git a/dirsrvtests/tests/suites/replication/changelog_trimming_test.py b/dirsrvtests/tests/suites/replication/changelog_trimming_test.py
index e8cc3da..7f9da59 100644
--- a/dirsrvtests/tests/suites/replication/changelog_trimming_test.py
+++ b/dirsrvtests/tests/suites/replication/changelog_trimming_test.py
@@ -9,6 +9,8 @@ from lib389.topologies import topology_m1 as topo
 from lib389.changelog import Changelog5
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/replication/cleanallruv_test.py b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
index 2b244da..09805d6 100644
--- a/dirsrvtests/tests/suites/replication/cleanallruv_test.py
+++ b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
@@ -22,6 +22,8 @@ from lib389.tasks import CleanAllRUVTask
 from lib389.idm.user import UserAccounts
 from lib389.config import LDBMConfig
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/replication/conflict_resolve_test.py b/dirsrvtests/tests/suites/replication/conflict_resolve_test.py
index c6490e4..99a0729 100644
--- a/dirsrvtests/tests/suites/replication/conflict_resolve_test.py
+++ b/dirsrvtests/tests/suites/replication/conflict_resolve_test.py
@@ -20,6 +20,8 @@ from lib389.replica import ReplicationManager
 from lib389.agreement import Agreements
 from lib389.plugins import MemberOfPlugin
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/replication/encryption_cl5_test.py b/dirsrvtests/tests/suites/replication/encryption_cl5_test.py
index c3dfa24..804da71 100644
--- a/dirsrvtests/tests/suites/replication/encryption_cl5_test.py
+++ b/dirsrvtests/tests/suites/replication/encryption_cl5_test.py
@@ -15,6 +15,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.topologies import topology_m2
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier1
+
 ATTRIBUTE = 'unhashed#user#password'
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
diff --git a/dirsrvtests/tests/suites/replication/regression_nsslapd_plugin_binddn_tracking_test.py b/dirsrvtests/tests/suites/replication/regression_nsslapd_plugin_binddn_tracking_test.py
index 9cc624f..23daae6 100644
--- a/dirsrvtests/tests/suites/replication/regression_nsslapd_plugin_binddn_tracking_test.py
+++ b/dirsrvtests/tests/suites/replication/regression_nsslapd_plugin_binddn_tracking_test.py
@@ -16,6 +16,8 @@ from lib389._constants import *
 from lib389.idm.user import UserAccounts
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/suites/replication/regression_test.py b/dirsrvtests/tests/suites/replication/regression_test.py
index d7acd05..77ab3a8 100644
--- a/dirsrvtests/tests/suites/replication/regression_test.py
+++ b/dirsrvtests/tests/suites/replication/regression_test.py
@@ -23,6 +23,8 @@ from lib389.replica import Replicas, ReplicationManager
 from lib389.changelog import Changelog5
 from lib389 import pid_from_file
 
+pytestmark = pytest.mark.tier1
+
 NEW_SUFFIX_NAME = 'test_repl'
 NEW_SUFFIX = 'o={}'.format(NEW_SUFFIX_NAME)
 NEW_BACKEND = 'repl_base'
diff --git a/dirsrvtests/tests/suites/replication/replica_config_test.py b/dirsrvtests/tests/suites/replication/replica_config_test.py
index a8f9d63..9a0e1b4 100644
--- a/dirsrvtests/tests/suites/replication/replica_config_test.py
+++ b/dirsrvtests/tests/suites/replication/replica_config_test.py
@@ -10,6 +10,8 @@ from lib389.topologies import topology_st as topo
 from lib389.replica import Replicas
 from lib389.agreement import Agreements
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/replication/ruvstore_test.py b/dirsrvtests/tests/suites/replication/ruvstore_test.py
old mode 100755
new mode 100644
index 6fadfb0..599f2a5
--- a/dirsrvtests/tests/suites/replication/ruvstore_test.py
+++ b/dirsrvtests/tests/suites/replication/ruvstore_test.py
@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccounts
 from lib389.topologies import topology_m2 as topo
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier1
+
 TEST_ENTRY_NAME = 'rep2lusr'
 NEW_RDN_NAME = 'ruvusr'
 ATTRIBUTES = ['objectClass', 'nsUniqueId', 'nsds50ruv', 'nsruvReplicaLastModified']
diff --git a/dirsrvtests/tests/suites/replication/single_master_test.py b/dirsrvtests/tests/suites/replication/single_master_test.py
index 1af37cc..5b73e23 100644
--- a/dirsrvtests/tests/suites/replication/single_master_test.py
+++ b/dirsrvtests/tests/suites/replication/single_master_test.py
@@ -24,6 +24,8 @@ from lib389._constants import (ReplicaRole, DEFAULT_SUFFIX, REPLICAID_MASTER_1,
                                 RA_NAME, RA_BINDDN, RA_BINDPW, RA_METHOD, RA_TRANSPORT_PROT,
                                 defaultProperties)
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/replication/tls_client_auth_repl_test.py b/dirsrvtests/tests/suites/replication/tls_client_auth_repl_test.py
index 34a0b3a..e78a435 100644
--- a/dirsrvtests/tests/suites/replication/tls_client_auth_repl_test.py
+++ b/dirsrvtests/tests/suites/replication/tls_client_auth_repl_test.py
@@ -16,6 +16,8 @@ from lib389._constants import DEFAULT_SUFFIX
 from lib389.replica import ReplicationManager, Replicas
 from lib389.topologies import topology_m2 as topo_m2
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/replication/tombstone_test.py b/dirsrvtests/tests/suites/replication/tombstone_test.py
index 10b6ca3..1910a20 100644
--- a/dirsrvtests/tests/suites/replication/tombstone_test.py
+++ b/dirsrvtests/tests/suites/replication/tombstone_test.py
@@ -14,6 +14,7 @@ from lib389.topologies import topology_m1
 from lib389.tombstone import Tombstones
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 
+pytestmark = pytest.mark.tier1
 
 def test_purge_success(topology_m1):
     """Verify that tombstones are created successfully
diff --git a/dirsrvtests/tests/suites/replication/wait_for_async_feature_test.py b/dirsrvtests/tests/suites/replication/wait_for_async_feature_test.py
index c79a0e2..b47bd41 100644
--- a/dirsrvtests/tests/suites/replication/wait_for_async_feature_test.py
+++ b/dirsrvtests/tests/suites/replication/wait_for_async_feature_test.py
@@ -18,6 +18,8 @@ from lib389._constants import SUFFIX, DEFAULT_SUFFIX, ErrorLog
 from lib389.agreement import Agreements
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/resource_limits/fdlimits_test.py b/dirsrvtests/tests/suites/resource_limits/fdlimits_test.py
index e5b14a7..b74a59a 100644
--- a/dirsrvtests/tests/suites/resource_limits/fdlimits_test.py
+++ b/dirsrvtests/tests/suites/resource_limits/fdlimits_test.py
@@ -5,6 +5,8 @@ import ldap
 from lib389._constants import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/roles/basic_test.py b/dirsrvtests/tests/suites/roles/basic_test.py
index 0b281bb..a3e3c5c 100644
--- a/dirsrvtests/tests/suites/roles/basic_test.py
+++ b/dirsrvtests/tests/suites/roles/basic_test.py
@@ -22,6 +22,7 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.role import FilterRoles, ManagedRoles, NestedRoles
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 DNBASE = "o=acivattr,{}".format(DEFAULT_SUFFIX)
 ENG_USER = "cn=enguser1,ou=eng,{}".format(DNBASE)
diff --git a/dirsrvtests/tests/suites/sasl/allowed_mechs_test.py b/dirsrvtests/tests/suites/sasl/allowed_mechs_test.py
index 81b1c04..d43a581 100644
--- a/dirsrvtests/tests/suites/sasl/allowed_mechs_test.py
+++ b/dirsrvtests/tests/suites/sasl/allowed_mechs_test.py
@@ -11,6 +11,7 @@ import pytest
 import os
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier1
 
 def test_basic_feature(topology_st):
     """Test the alloweed sasl mechanism feature
diff --git a/dirsrvtests/tests/suites/sasl/plain_test.py b/dirsrvtests/tests/suites/sasl/plain_test.py
index b907126..c7e672f 100644
--- a/dirsrvtests/tests/suites/sasl/plain_test.py
+++ b/dirsrvtests/tests/suites/sasl/plain_test.py
@@ -17,6 +17,8 @@ from lib389._constants import DEFAULT_SUFFIX, DEFAULT_SECURE_PORT
 from lib389.sasl import PlainSASL
 from lib389.idm.services import ServiceAccounts, ServiceAccount
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/suites/sasl/regression_test.py b/dirsrvtests/tests/suites/sasl/regression_test.py
index 4741008..dbd73fc 100644
--- a/dirsrvtests/tests/suites/sasl/regression_test.py
+++ b/dirsrvtests/tests/suites/sasl/regression_test.py
@@ -15,7 +15,8 @@ from lib389.utils import *
 from lib389.topologies import topology_m2
 from lib389._constants import *
 
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/suites/schema/eduperson_test.py b/dirsrvtests/tests/suites/schema/eduperson_test.py
new file mode 100644
index 0000000..1ddcc63
--- /dev/null
+++ b/dirsrvtests/tests/suites/schema/eduperson_test.py
@@ -0,0 +1,90 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2017 Red Hat, Inc.
+# All rights reserved.
+#
+# License: GPL (version 3 or any later version).
+# See LICENSE for details.
+# --- END COPYRIGHT BLOCK ---
+#
+
+
+import os
+import logging
+import pytest
+import ldap
+
+from lib389.idm.user import UserAccounts
+from lib389.topologies import topology_st as topology
+from lib389._constants import DEFAULT_SUFFIX
+
+pytestmark = pytest.mark.tier1
+
+DEBUGGING = os.getenv('DEBUGGING', False)
+
+if DEBUGGING is not False:
+    DEBUGGING = True
+
+if DEBUGGING:
+    logging.getLogger(__name__).setLevel(logging.DEBUG)
+else:
+    logging.getLogger(__name__).setLevel(logging.INFO)
+
+log = logging.getLogger(__name__)
+
+
+def test_account_locking(topology):
+    """Test the eduperson schema works
+
+    :id: f2f15449-a822-4ec6-b4ea-bd6db6240a6c
+
+    :setup: Standalone instance
+
+    :steps:
+        1. Add a common user
+        2. Extend the user with eduPerson objectClass
+        3. Add attributes in eduPerson
+
+    :expectedresults:
+        1. User should be added with its properties
+        2. User should be extended with eduPerson as the objectClass
+        3. eduPerson should be added
+    """
+
+    if DEBUGGING:
+        # Add debugging steps(if any)...
+        pass
+
+    users = UserAccounts(topology.standalone, DEFAULT_SUFFIX)
+
+    user_properties = {
+        'uid': 'testuser',
+        'cn' : 'testuser',
+        'sn' : 'user',
+        'uidNumber' : '1000',
+        'gidNumber' : '2000',
+        'homeDirectory' : '/home/testuser',
+    }
+    testuser = users.create(properties=user_properties)
+
+    # Extend the user with eduPerson
+    testuser.add('objectClass', 'eduPerson')
+
+    # now add eduPerson attrs
+    testuser.add('eduPersonAffiliation', 'value') # From 2002
+    testuser.add('eduPersonNickName', 'value') # From 2002
+    testuser.add('eduPersonOrgDN', 'ou=People,%s' % DEFAULT_SUFFIX) # From 2002
+    testuser.add('eduPersonOrgUnitDN', 'ou=People,%s' % DEFAULT_SUFFIX) # From 2002
+    testuser.add('eduPersonPrimaryAffiliation', 'value') # From 2002
+    testuser.add('eduPersonPrincipalName', 'value') # From 2002
+    testuser.add('eduPersonEntitlement', 'value') # From 2002
+    testuser.add('eduPersonPrimaryOrgUnitDN', 'ou=People,%s' % DEFAULT_SUFFIX) # From 2002
+    testuser.add('eduPersonScopedAffiliation', 'value') # From 2003
+    testuser.add('eduPersonTargetedID', 'value') # From 2003
+    testuser.add('eduPersonAssurance', 'value') # From 2008
+    testuser.add('eduPersonPrincipalNamePrior', 'value') # From 2012
+    testuser.add('eduPersonUniqueId', 'value') # From 2013
+    testuser.add('eduPersonOrcid', 'value') # From 2016
+
+    log.info('Test PASSED')
+
+
diff --git a/dirsrvtests/tests/suites/schema/schema_reload_test.py b/dirsrvtests/tests/suites/schema/schema_reload_test.py
index a42d038..2ece5dd 100644
--- a/dirsrvtests/tests/suites/schema/schema_reload_test.py
+++ b/dirsrvtests/tests/suites/schema/schema_reload_test.py
@@ -13,6 +13,8 @@ import os
 from lib389.topologies import topology_st as topo
 from lib389._constants import TASK_WAIT
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/schema/schema_replication_test.py b/dirsrvtests/tests/suites/schema/schema_replication_test.py
index 1b2117d..bc3170f 100644
--- a/dirsrvtests/tests/suites/schema/schema_replication_test.py
+++ b/dirsrvtests/tests/suites/schema/schema_replication_test.py
@@ -24,7 +24,8 @@ from lib389.topologies import topology_m1c1
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3'), reason="Not implemented")]
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/suites/schema/schema_test.py b/dirsrvtests/tests/suites/schema/schema_test.py
new file mode 100644
index 0000000..d590624
--- /dev/null
+++ b/dirsrvtests/tests/suites/schema/schema_test.py
@@ -0,0 +1,173 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2016 Red Hat, Inc.
+# All rights reserved.
+#
+# License: GPL (version 3 or any later version).
+# See LICENSE for details.
+# --- END COPYRIGHT BLOCK ---
+#
+'''
+Created on Dec 18, 2013
+
+@author: rmeggins
+'''
+import logging
+
+import ldap
+import pytest
+import six
+from ldap.cidict import cidict
+from ldap.schema import SubSchema
+from lib389._constants import *
+from lib389.topologies import topology_st
+
+pytestmark = pytest.mark.tier1
+
+logging.getLogger(__name__).setLevel(logging.DEBUG)
+log = logging.getLogger(__name__)
+
+attrclass = ldap.schema.models.AttributeType
+occlass = ldap.schema.models.ObjectClass
+syntax_len_supported = False
+
+
+def ochasattr(subschema, oc, mustormay, attr, key):
+    """See if the oc and any of its parents and ancestors have the
+    given attr"""
+    rc = False
+    if not key in oc.__dict__:
+        dd = cidict()
+        for ii in oc.__dict__[mustormay]:
+            dd[ii] = ii
+        oc.__dict__[key] = dd
+    if attr in oc.__dict__[key]:
+        rc = True
+    else:
+        # look in parents
+        for noroid in oc.sup:
+            ocpar = subschema.get_obj(occlass, noroid)
+            assert (ocpar)
+            rc = ochasattr(subschema, ocpar, mustormay, attr, key)
+            if rc:
+                break
+    return rc
+
+
+def ochasattrs(subschema, oc, mustormay, attrs):
+    key = mustormay + "dict"
+    ret = []
+    for attr in attrs:
+        if not ochasattr(subschema, oc, mustormay, attr, key):
+            ret.append(attr)
+    return ret
+
+
+def mycmp(v1, v2):
+    v1ary, v2ary = [v1], [v2]
+    if isinstance(v1, list) or isinstance(v1, tuple):
+        v1ary, v2ary = list(set([x.lower() for x in v1])), list(set([x.lower() for x in v2]))
+    if not len(v1ary) == len(v2ary):
+        return False
+    for v1, v2 in zip(v1ary, v2ary):
+        if isinstance(v1, six.string_types):
+            if not len(v1) == len(v2):
+                return False
+        if not v1 == v2:
+            return False
+    return True
+
+
+def ocgetdiffs(ldschema, oc1, oc2):
+    fields = ['obsolete', 'names', 'desc', 'must', 'may', 'kind', 'sup']
+    ret = ''
+    for field in fields:
+        v1, v2 = oc1.__dict__[field], oc2.__dict__[field]
+        if field == 'may' or field == 'must':
+            missing = ochasattrs(ldschema, oc1, field, oc2.__dict__[field])
+            if missing:
+                ret = ret + '\t%s is missing %s\n' % (field, missing)
+            missing = ochasattrs(ldschema, oc2, field, oc1.__dict__[field])
+            if missing:
+                ret = ret + '\t%s is missing %s\n' % (field, missing)
+        elif not mycmp(v1, v2):
+            ret = ret + '\t%s differs: [%s] vs. [%s]\n' % (field, oc1.__dict__[field], oc2.__dict__[field])
+    return ret
+
+
+def atgetparfield(subschema, at, field):
+    v = None
+    for nameoroid in at.sup:
+        atpar = subschema.get_obj(attrclass, nameoroid)
+        assert (atpar)
+        v = atpar.__dict__.get(field, atgetparfield(subschema, atpar, field))
+        if v is not None:
+            break
+    return v
+
+
+def atgetdiffs(ldschema, at1, at2):
+    fields = ['names', 'desc', 'obsolete', 'sup', 'equality', 'ordering', 'substr', 'syntax',
+              'single_value', 'collective', 'no_user_mod', 'usage']
+    if syntax_len_supported:
+        fields.append('syntax_len')
+    ret = ''
+    for field in fields:
+        v1 = at1.__dict__.get(field) or atgetparfield(ldschema, at1, field)
+        v2 = at2.__dict__.get(field) or atgetparfield(ldschema, at2, field)
+        if not mycmp(v1, v2):
+            ret = ret + '\t%s differs: [%s] vs. [%s]\n' % (field, at1.__dict__[field], at2.__dict__[field])
+    return ret
+
+
+def test_schema_comparewithfiles(topology_st):
+    '''Compare the schema from ldap cn=schema with the schema files'''
+
+    log.info('Running test_schema_comparewithfiles...')
+
+    retval = True
+    schemainst = topology_st.standalone
+    ldschema = schemainst.schema.get_subschema()
+    assert ldschema
+    for fn in schemainst.schema.list_files():
+        try:
+            fschema = schemainst.schema.file_to_subschema(fn)
+            if fschema is None:
+                raise Exception("Empty schema file %s" % fn)
+        except:
+            log.warning("Unable to parse %s as a schema file - skipping" % fn)
+            continue
+        log.info("Parsed %s as a schema file - checking" % fn)
+        for oid in fschema.listall(occlass):
+            se = fschema.get_obj(occlass, oid)
+            assert se
+            ldse = ldschema.get_obj(occlass, oid)
+            if not ldse:
+                log.error("objectclass in %s but not in %s: %s" % (fn, DN_SCHEMA, se))
+                retval = False
+                continue
+            ret = ocgetdiffs(ldschema, ldse, se)
+            if ret:
+                log.error("name %s oid %s\n%s" % (se.names[0], oid, ret))
+                retval = False
+        for oid in fschema.listall(attrclass):
+            se = fschema.get_obj(attrclass, oid)
+            assert se
+            ldse = ldschema.get_obj(attrclass, oid)
+            if not ldse:
+                log.error("attributetype in %s but not in %s: %s" % (fn, DN_SCHEMA, se))
+                retval = False
+                continue
+            ret = atgetdiffs(ldschema, ldse, se)
+            if ret:
+                log.error("name %s oid %s\n%s" % (se.names[0], oid, ret))
+                retval = False
+    assert retval
+
+    log.info('test_schema_comparewithfiles: PASSED')
+
+
+if __name__ == '__main__':
+    # Run isolated
+    # -s for DEBUG mode
+    CURRENT_FILE = os.path.realpath(__file__)
+    pytest.main("-s %s" % CURRENT_FILE)
diff --git a/dirsrvtests/tests/suites/schema/test_eduperson.py b/dirsrvtests/tests/suites/schema/test_eduperson.py
deleted file mode 100644
index fd61cfd..0000000
--- a/dirsrvtests/tests/suites/schema/test_eduperson.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# --- BEGIN COPYRIGHT BLOCK ---
-# Copyright (C) 2017 Red Hat, Inc.
-# All rights reserved.
-#
-# License: GPL (version 3 or any later version).
-# See LICENSE for details.
-# --- END COPYRIGHT BLOCK ---
-#
-
-
-import os
-import logging
-import pytest
-import ldap
-
-from lib389.idm.user import UserAccounts
-from lib389.topologies import topology_st as topology
-from lib389._constants import DEFAULT_SUFFIX
-
-DEBUGGING = os.getenv('DEBUGGING', False)
-
-if DEBUGGING is not False:
-    DEBUGGING = True
-
-if DEBUGGING:
-    logging.getLogger(__name__).setLevel(logging.DEBUG)
-else:
-    logging.getLogger(__name__).setLevel(logging.INFO)
-
-log = logging.getLogger(__name__)
-
-
-def test_account_locking(topology):
-    """Test the eduperson schema works
-
-    :id: f2f15449-a822-4ec6-b4ea-bd6db6240a6c
-
-    :setup: Standalone instance
-
-    :steps:
-        1. Add a common user
-        2. Extend the user with eduPerson objectClass
-        3. Add attributes in eduPerson
-
-    :expectedresults:
-        1. User should be added with its properties
-        2. User should be extended with eduPerson as the objectClass
-        3. eduPerson should be added
-    """
-
-    if DEBUGGING:
-        # Add debugging steps(if any)...
-        pass
-
-    users = UserAccounts(topology.standalone, DEFAULT_SUFFIX)
-
-    user_properties = {
-        'uid': 'testuser',
-        'cn' : 'testuser',
-        'sn' : 'user',
-        'uidNumber' : '1000',
-        'gidNumber' : '2000',
-        'homeDirectory' : '/home/testuser',
-    }
-    testuser = users.create(properties=user_properties)
-
-    # Extend the user with eduPerson
-    testuser.add('objectClass', 'eduPerson')
-
-    # now add eduPerson attrs
-    testuser.add('eduPersonAffiliation', 'value') # From 2002
-    testuser.add('eduPersonNickName', 'value') # From 2002
-    testuser.add('eduPersonOrgDN', 'ou=People,%s' % DEFAULT_SUFFIX) # From 2002
-    testuser.add('eduPersonOrgUnitDN', 'ou=People,%s' % DEFAULT_SUFFIX) # From 2002
-    testuser.add('eduPersonPrimaryAffiliation', 'value') # From 2002
-    testuser.add('eduPersonPrincipalName', 'value') # From 2002
-    testuser.add('eduPersonEntitlement', 'value') # From 2002
-    testuser.add('eduPersonPrimaryOrgUnitDN', 'ou=People,%s' % DEFAULT_SUFFIX) # From 2002
-    testuser.add('eduPersonScopedAffiliation', 'value') # From 2003
-    testuser.add('eduPersonTargetedID', 'value') # From 2003
-    testuser.add('eduPersonAssurance', 'value') # From 2008
-    testuser.add('eduPersonPrincipalNamePrior', 'value') # From 2012
-    testuser.add('eduPersonUniqueId', 'value') # From 2013
-    testuser.add('eduPersonOrcid', 'value') # From 2016
-
-    log.info('Test PASSED')
-
-
diff --git a/dirsrvtests/tests/suites/schema/test_schema.py b/dirsrvtests/tests/suites/schema/test_schema.py
deleted file mode 100644
index 4a6ecad..0000000
--- a/dirsrvtests/tests/suites/schema/test_schema.py
+++ /dev/null
@@ -1,171 +0,0 @@
-# --- BEGIN COPYRIGHT BLOCK ---
-# Copyright (C) 2016 Red Hat, Inc.
-# All rights reserved.
-#
-# License: GPL (version 3 or any later version).
-# See LICENSE for details.
-# --- END COPYRIGHT BLOCK ---
-#
-'''
-Created on Dec 18, 2013
-
-@author: rmeggins
-'''
-import logging
-
-import ldap
-import pytest
-import six
-from ldap.cidict import cidict
-from ldap.schema import SubSchema
-from lib389._constants import *
-from lib389.topologies import topology_st
-
-logging.getLogger(__name__).setLevel(logging.DEBUG)
-log = logging.getLogger(__name__)
-
-attrclass = ldap.schema.models.AttributeType
-occlass = ldap.schema.models.ObjectClass
-syntax_len_supported = False
-
-
-def ochasattr(subschema, oc, mustormay, attr, key):
-    """See if the oc and any of its parents and ancestors have the
-    given attr"""
-    rc = False
-    if not key in oc.__dict__:
-        dd = cidict()
-        for ii in oc.__dict__[mustormay]:
-            dd[ii] = ii
-        oc.__dict__[key] = dd
-    if attr in oc.__dict__[key]:
-        rc = True
-    else:
-        # look in parents
-        for noroid in oc.sup:
-            ocpar = subschema.get_obj(occlass, noroid)
-            assert (ocpar)
-            rc = ochasattr(subschema, ocpar, mustormay, attr, key)
-            if rc:
-                break
-    return rc
-
-
-def ochasattrs(subschema, oc, mustormay, attrs):
-    key = mustormay + "dict"
-    ret = []
-    for attr in attrs:
-        if not ochasattr(subschema, oc, mustormay, attr, key):
-            ret.append(attr)
-    return ret
-
-
-def mycmp(v1, v2):
-    v1ary, v2ary = [v1], [v2]
-    if isinstance(v1, list) or isinstance(v1, tuple):
-        v1ary, v2ary = list(set([x.lower() for x in v1])), list(set([x.lower() for x in v2]))
-    if not len(v1ary) == len(v2ary):
-        return False
-    for v1, v2 in zip(v1ary, v2ary):
-        if isinstance(v1, six.string_types):
-            if not len(v1) == len(v2):
-                return False
-        if not v1 == v2:
-            return False
-    return True
-
-
-def ocgetdiffs(ldschema, oc1, oc2):
-    fields = ['obsolete', 'names', 'desc', 'must', 'may', 'kind', 'sup']
-    ret = ''
-    for field in fields:
-        v1, v2 = oc1.__dict__[field], oc2.__dict__[field]
-        if field == 'may' or field == 'must':
-            missing = ochasattrs(ldschema, oc1, field, oc2.__dict__[field])
-            if missing:
-                ret = ret + '\t%s is missing %s\n' % (field, missing)
-            missing = ochasattrs(ldschema, oc2, field, oc1.__dict__[field])
-            if missing:
-                ret = ret + '\t%s is missing %s\n' % (field, missing)
-        elif not mycmp(v1, v2):
-            ret = ret + '\t%s differs: [%s] vs. [%s]\n' % (field, oc1.__dict__[field], oc2.__dict__[field])
-    return ret
-
-
-def atgetparfield(subschema, at, field):
-    v = None
-    for nameoroid in at.sup:
-        atpar = subschema.get_obj(attrclass, nameoroid)
-        assert (atpar)
-        v = atpar.__dict__.get(field, atgetparfield(subschema, atpar, field))
-        if v is not None:
-            break
-    return v
-
-
-def atgetdiffs(ldschema, at1, at2):
-    fields = ['names', 'desc', 'obsolete', 'sup', 'equality', 'ordering', 'substr', 'syntax',
-              'single_value', 'collective', 'no_user_mod', 'usage']
-    if syntax_len_supported:
-        fields.append('syntax_len')
-    ret = ''
-    for field in fields:
-        v1 = at1.__dict__.get(field) or atgetparfield(ldschema, at1, field)
-        v2 = at2.__dict__.get(field) or atgetparfield(ldschema, at2, field)
-        if not mycmp(v1, v2):
-            ret = ret + '\t%s differs: [%s] vs. [%s]\n' % (field, at1.__dict__[field], at2.__dict__[field])
-    return ret
-
-
-def test_schema_comparewithfiles(topology_st):
-    '''Compare the schema from ldap cn=schema with the schema files'''
-
-    log.info('Running test_schema_comparewithfiles...')
-
-    retval = True
-    schemainst = topology_st.standalone
-    ldschema = schemainst.schema.get_subschema()
-    assert ldschema
-    for fn in schemainst.schema.list_files():
-        try:
-            fschema = schemainst.schema.file_to_subschema(fn)
-            if fschema is None:
-                raise Exception("Empty schema file %s" % fn)
-        except:
-            log.warning("Unable to parse %s as a schema file - skipping" % fn)
-            continue
-        log.info("Parsed %s as a schema file - checking" % fn)
-        for oid in fschema.listall(occlass):
-            se = fschema.get_obj(occlass, oid)
-            assert se
-            ldse = ldschema.get_obj(occlass, oid)
-            if not ldse:
-                log.error("objectclass in %s but not in %s: %s" % (fn, DN_SCHEMA, se))
-                retval = False
-                continue
-            ret = ocgetdiffs(ldschema, ldse, se)
-            if ret:
-                log.error("name %s oid %s\n%s" % (se.names[0], oid, ret))
-                retval = False
-        for oid in fschema.listall(attrclass):
-            se = fschema.get_obj(attrclass, oid)
-            assert se
-            ldse = ldschema.get_obj(attrclass, oid)
-            if not ldse:
-                log.error("attributetype in %s but not in %s: %s" % (fn, DN_SCHEMA, se))
-                retval = False
-                continue
-            ret = atgetdiffs(ldschema, ldse, se)
-            if ret:
-                log.error("name %s oid %s\n%s" % (se.names[0], oid, ret))
-                retval = False
-    assert retval
-
-    log.info('test_schema_comparewithfiles: PASSED')
-
-
-if __name__ == '__main__':
-    # Run isolated
-    # -s for DEBUG mode
-    CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s %s" % CURRENT_FILE)
diff --git a/dirsrvtests/tests/suites/setup_ds/dscreate_test.py b/dirsrvtests/tests/suites/setup_ds/dscreate_test.py
index aa2d13b..c589b4e 100644
--- a/dirsrvtests/tests/suites/setup_ds/dscreate_test.py
+++ b/dirsrvtests/tests/suites/setup_ds/dscreate_test.py
@@ -18,6 +18,8 @@ from lib389._constants import *
 
 import tempfile
 
+pytestmark = pytest.mark.tier0
+
 INSTANCE_PORT = 54321
 INSTANCE_SERVERID = 'standalone'
 
diff --git a/dirsrvtests/tests/suites/setup_ds/remove_test.py b/dirsrvtests/tests/suites/setup_ds/remove_test.py
index 0be7c8b..e9f131b 100644
--- a/dirsrvtests/tests/suites/setup_ds/remove_test.py
+++ b/dirsrvtests/tests/suites/setup_ds/remove_test.py
@@ -15,6 +15,8 @@ from lib389.instance.remove import remove_ds_instance
 from lib389._constants import ReplicaRole
 from lib389.topologies import create_topology
 
+pytestmark = pytest.mark.tier0
+
 
 @pytest.fixture(scope="function")
 def topology_st(request):
diff --git a/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py b/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py
index 69866c1..ee2b40f 100644
--- a/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py
+++ b/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py
@@ -6,6 +6,8 @@ from lib389._constants import (DEFAULT_SUFFIX, SER_HOST, SER_PORT,
 
 from lib389 import DirSrv
 
+pytestmark = pytest.mark.tier0
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/stat/mmt_state_test.py b/dirsrvtests/tests/suites/stat/mmt_state_test.py
index 2227389..9e3da83 100644
--- a/dirsrvtests/tests/suites/stat/mmt_state_test.py
+++ b/dirsrvtests/tests/suites/stat/mmt_state_test.py
@@ -6,6 +6,8 @@ from lib389.idm.user import UserAccounts
 from lib389.topologies import topology_m2 as topo
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
@@ -351,4 +353,4 @@ if __name__ == "__main__":
     # Run isolated
     # -s for DEBUG mode
     CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s -v %s" % CURRENT_FILE)
\ No newline at end of file
+    pytest.main("-s -v %s" % CURRENT_FILE)
diff --git a/dirsrvtests/tests/suites/syntax/mr_test.py b/dirsrvtests/tests/suites/syntax/mr_test.py
index 5706122..f622b75 100644
--- a/dirsrvtests/tests/suites/syntax/mr_test.py
+++ b/dirsrvtests/tests/suites/syntax/mr_test.py
@@ -7,6 +7,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st as topo
 from lib389._controls import SSSRequestControl
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/suites/tls/tls_check_crl_test.py b/dirsrvtests/tests/suites/tls/tls_check_crl_test.py
index 8b4d07f..03ad04d 100644
--- a/dirsrvtests/tests/suites/tls/tls_check_crl_test.py
+++ b/dirsrvtests/tests/suites/tls/tls_check_crl_test.py
@@ -12,6 +12,8 @@ import pytest
 import ldap
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier1
+
 def test_tls_check_crl(topology_st):
     """Test that TLS check_crl configurations work as expected.
 
diff --git a/dirsrvtests/tests/suites/vlv/regression_test.py b/dirsrvtests/tests/suites/vlv/regression_test.py
index 4ed4477..acf5957 100644
--- a/dirsrvtests/tests/suites/vlv/regression_test.py
+++ b/dirsrvtests/tests/suites/vlv/regression_test.py
@@ -16,6 +16,8 @@ from lib389.index import *
 from lib389.mappingTree import *
 from lib389.backend import *
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47462_test.py b/dirsrvtests/tests/tickets/ticket47462_test.py
index 8b89d0b..1c26ec7 100644
--- a/dirsrvtests/tests/tickets/ticket47462_test.py
+++ b/dirsrvtests/tests/tickets/ticket47462_test.py
@@ -16,6 +16,8 @@ from lib389._constants import *
 from lib389.properties import *
 from lib389.topologies import topology_m2
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47560_test.py b/dirsrvtests/tests/tickets/ticket47560_test.py
index 273f944..38479bd 100644
--- a/dirsrvtests/tests/tickets/ticket47560_test.py
+++ b/dirsrvtests/tests/tickets/ticket47560_test.py
@@ -17,6 +17,8 @@ from lib389.properties import *
 from lib389.topologies import topology_st
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/tickets/ticket47573_test.py b/dirsrvtests/tests/tickets/ticket47573_test.py
index 5019ec1..08dfbb4 100644
--- a/dirsrvtests/tests/tickets/ticket47573_test.py
+++ b/dirsrvtests/tests/tickets/ticket47573_test.py
@@ -22,6 +22,8 @@ from lib389._constants import *
 from lib389.topologies import topology_m1c1
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47619_test.py b/dirsrvtests/tests/tickets/ticket47619_test.py
index 1bd613f..9ffd3eb 100644
--- a/dirsrvtests/tests/tickets/ticket47619_test.py
+++ b/dirsrvtests/tests/tickets/ticket47619_test.py
@@ -21,6 +21,8 @@ from lib389._constants import *
 from lib389.properties import *
 from lib389.topologies import topology_m1c1
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47640_test.py b/dirsrvtests/tests/tickets/ticket47640_test.py
index 833f9fb..996735f 100644
--- a/dirsrvtests/tests/tickets/ticket47640_test.py
+++ b/dirsrvtests/tests/tickets/ticket47640_test.py
@@ -14,7 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import PLUGIN_LINKED_ATTRS, DEFAULT_SUFFIX
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket47653MMR_test.py b/dirsrvtests/tests/tickets/ticket47653MMR_test.py
index c23a345..b36befe 100644
--- a/dirsrvtests/tests/tickets/ticket47653MMR_test.py
+++ b/dirsrvtests/tests/tickets/ticket47653MMR_test.py
@@ -24,7 +24,8 @@ logging.getLogger(__name__).setLevel(logging.DEBUG)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")
+pytestmark =[pytest.mark.tier2,
+             pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")]
 log = logging.getLogger(__name__)
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
diff --git a/dirsrvtests/tests/tickets/ticket47676_test.py b/dirsrvtests/tests/tickets/ticket47676_test.py
index fd6276b..eb0c9fb 100644
--- a/dirsrvtests/tests/tickets/ticket47676_test.py
+++ b/dirsrvtests/tests/tickets/ticket47676_test.py
@@ -25,7 +25,8 @@ logging.getLogger(__name__).setLevel(logging.DEBUG)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")]
 log = logging.getLogger(__name__)
 
 SCHEMA_DN = "cn=schema"
diff --git a/dirsrvtests/tests/tickets/ticket47714_test.py b/dirsrvtests/tests/tickets/ticket47714_test.py
index 9e931e8..7a6a564 100644
--- a/dirsrvtests/tests/tickets/ticket47714_test.py
+++ b/dirsrvtests/tests/tickets/ticket47714_test.py
@@ -20,7 +20,8 @@ log = logging.getLogger(__name__)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")]
 ACCT_POLICY_CONFIG_DN = ('cn=config,cn=%s,cn=plugins,cn=config' %
                          PLUGIN_ACCT_POLICY)
 ACCT_POLICY_DN = 'cn=Account Inactivation Policy,%s' % SUFFIX
diff --git a/dirsrvtests/tests/tickets/ticket47721_test.py b/dirsrvtests/tests/tickets/ticket47721_test.py
index ef57557..44cf38b 100644
--- a/dirsrvtests/tests/tickets/ticket47721_test.py
+++ b/dirsrvtests/tests/tickets/ticket47721_test.py
@@ -22,6 +22,8 @@ from lib389.topologies import topology_m2
 from lib389.replica import ReplicationManager
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47781_test.py b/dirsrvtests/tests/tickets/ticket47781_test.py
index 1949154..3f8d808 100644
--- a/dirsrvtests/tests/tickets/ticket47781_test.py
+++ b/dirsrvtests/tests/tickets/ticket47781_test.py
@@ -18,6 +18,8 @@ from lib389._constants import (defaultProperties, DEFAULT_SUFFIX, ReplicaRole,
                                REPLICATION_BIND_METHOD, REPLICATION_TRANSPORT, RA_NAME,
                                RA_BINDDN, RA_BINDPW, RA_METHOD, RA_TRANSPORT_PROT)
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/tickets/ticket47787_test.py b/dirsrvtests/tests/tickets/ticket47787_test.py
index 306e70d..7b2c104 100644
--- a/dirsrvtests/tests/tickets/ticket47787_test.py
+++ b/dirsrvtests/tests/tickets/ticket47787_test.py
@@ -22,6 +22,8 @@ from lib389._constants import *
 from lib389.topologies import topology_m2
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47808_test.py b/dirsrvtests/tests/tickets/ticket47808_test.py
index 2863176..8ca75eb 100644
--- a/dirsrvtests/tests/tickets/ticket47808_test.py
+++ b/dirsrvtests/tests/tickets/ticket47808_test.py
@@ -15,6 +15,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 ATTRIBUTE_UNIQUENESS_PLUGIN = 'cn=attribute uniqueness,cn=plugins,cn=config'
diff --git a/dirsrvtests/tests/tickets/ticket47815_test.py b/dirsrvtests/tests/tickets/ticket47815_test.py
index 0ceb31f..4263ab7 100644
--- a/dirsrvtests/tests/tickets/ticket47815_test.py
+++ b/dirsrvtests/tests/tickets/ticket47815_test.py
@@ -19,7 +19,9 @@ log = logging.getLogger(__name__)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.3') or ds_is_newer('1.3.7'), reason="Not implemented, or invalid by nsMemberOf")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.3') or ds_is_newer('1.3.7'), 
+              reason="Not implemented, or invalid by nsMemberOf")]
 
 def test_ticket47815(topology_st):
     """
diff --git a/dirsrvtests/tests/tickets/ticket47819_test.py b/dirsrvtests/tests/tickets/ticket47819_test.py
index 3955430..ba8d97e 100644
--- a/dirsrvtests/tests/tickets/ticket47819_test.py
+++ b/dirsrvtests/tests/tickets/ticket47819_test.py
@@ -17,6 +17,8 @@ from lib389._constants import (defaultProperties, DEFAULT_SUFFIX, ReplicaRole,
                                REPLICAID_MASTER_1, REPLICA_PRECISE_PURGING, REPLICA_PURGE_DELAY,
                                REPLICA_PURGE_INTERVAL)
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/tickets/ticket47823_test.py b/dirsrvtests/tests/tickets/ticket47823_test.py
index 3724ace..07a3d90 100644
--- a/dirsrvtests/tests/tickets/ticket47823_test.py
+++ b/dirsrvtests/tests/tickets/ticket47823_test.py
@@ -22,7 +22,8 @@ log = logging.getLogger(__name__)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")]
 PROVISIONING_CN = "provisioning"
 PROVISIONING_DN = "cn=%s,%s" % (PROVISIONING_CN, SUFFIX)
 
diff --git a/dirsrvtests/tests/tickets/ticket47828_test.py b/dirsrvtests/tests/tickets/ticket47828_test.py
index aea3490..e20f753 100644
--- a/dirsrvtests/tests/tickets/ticket47828_test.py
+++ b/dirsrvtests/tests/tickets/ticket47828_test.py
@@ -21,7 +21,8 @@ ACCT_POLICY_DN = 'cn=Account Inactivation Policy,%s' % SUFFIX
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")]
 INACTIVITY_LIMIT = '9'
 SEARCHFILTER = '(objectclass=*)'
 
diff --git a/dirsrvtests/tests/tickets/ticket47829_test.py b/dirsrvtests/tests/tickets/ticket47829_test.py
index 8f1a872..64aee67 100644
--- a/dirsrvtests/tests/tickets/ticket47829_test.py
+++ b/dirsrvtests/tests/tickets/ticket47829_test.py
@@ -17,7 +17,8 @@ from lib389.topologies import topology_st
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 SCOPE_IN_CN = 'in'
 SCOPE_OUT_CN = 'out'
 SCOPE_IN_DN = 'cn=%s,%s' % (SCOPE_IN_CN, SUFFIX)
diff --git a/dirsrvtests/tests/tickets/ticket47833_test.py b/dirsrvtests/tests/tickets/ticket47833_test.py
index 810cba9..bb6e3fb 100644
--- a/dirsrvtests/tests/tickets/ticket47833_test.py
+++ b/dirsrvtests/tests/tickets/ticket47833_test.py
@@ -22,7 +22,8 @@ PROVISIONING_CN = "provisioning"
 PROVISIONING_DN = "cn=%s,%s" % (PROVISIONING_CN, SCOPE_IN_DN)
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")]
 
 ACTIVE_CN = "accounts"
 STAGE_CN = "staged users"
diff --git a/dirsrvtests/tests/tickets/ticket47838_test.py b/dirsrvtests/tests/tickets/ticket47838_test.py
index 38521d5..518dd50 100644
--- a/dirsrvtests/tests/tickets/ticket47838_test.py
+++ b/dirsrvtests/tests/tickets/ticket47838_test.py
@@ -23,7 +23,8 @@ CONFIG_DN = 'cn=config'
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")]
 ENCRYPTION_DN = 'cn=encryption,%s' % CONFIG_DN
 MY_SECURE_PORT = '63601'
 RSA = 'RSA'
diff --git a/dirsrvtests/tests/tickets/ticket47869MMR_test.py b/dirsrvtests/tests/tickets/ticket47869MMR_test.py
index ed6b3a2..2e1af22 100644
--- a/dirsrvtests/tests/tickets/ticket47869MMR_test.py
+++ b/dirsrvtests/tests/tickets/ticket47869MMR_test.py
@@ -17,6 +17,8 @@ from lib389.topologies import topology_m2
 from lib389.replica import ReplicationManager
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47871_test.py b/dirsrvtests/tests/tickets/ticket47871_test.py
index 0243157..6012de3 100644
--- a/dirsrvtests/tests/tickets/ticket47871_test.py
+++ b/dirsrvtests/tests/tickets/ticket47871_test.py
@@ -24,7 +24,8 @@ logging.getLogger(__name__).setLevel(logging.DEBUG)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")]
 log = logging.getLogger(__name__)
 
 TEST_REPL_DN = "cn=test_repl, %s" % SUFFIX
diff --git a/dirsrvtests/tests/tickets/ticket47900_test.py b/dirsrvtests/tests/tickets/ticket47900_test.py
index 8da5312..ce5ce33 100644
--- a/dirsrvtests/tests/tickets/ticket47900_test.py
+++ b/dirsrvtests/tests/tickets/ticket47900_test.py
@@ -15,6 +15,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 CONFIG_DN = 'cn=config'
diff --git a/dirsrvtests/tests/tickets/ticket47910_test.py b/dirsrvtests/tests/tickets/ticket47910_test.py
index 35945d1..799d44d 100644
--- a/dirsrvtests/tests/tickets/ticket47910_test.py
+++ b/dirsrvtests/tests/tickets/ticket47910_test.py
@@ -21,7 +21,8 @@ log = logging.getLogger(__name__)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 
 
 @pytest.fixture(scope="module")
diff --git a/dirsrvtests/tests/tickets/ticket47920_test.py b/dirsrvtests/tests/tickets/ticket47920_test.py
index 2081100..25203d4 100644
--- a/dirsrvtests/tests/tickets/ticket47920_test.py
+++ b/dirsrvtests/tests/tickets/ticket47920_test.py
@@ -22,7 +22,8 @@ SCOPE_OUT_DN = 'cn=%s,%s' % (SCOPE_OUT_CN, SUFFIX)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")]
 PROVISIONING_CN = "provisioning"
 PROVISIONING_DN = "cn=%s,%s" % (PROVISIONING_CN, SCOPE_IN_DN)
 
diff --git a/dirsrvtests/tests/tickets/ticket47921_test.py b/dirsrvtests/tests/tickets/ticket47921_test.py
index 990abe7..d52d0c5 100644
--- a/dirsrvtests/tests/tickets/ticket47921_test.py
+++ b/dirsrvtests/tests/tickets/ticket47921_test.py
@@ -11,6 +11,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47927_test.py b/dirsrvtests/tests/tickets/ticket47927_test.py
index 43165d3..887fe1a 100644
--- a/dirsrvtests/tests/tickets/ticket47927_test.py
+++ b/dirsrvtests/tests/tickets/ticket47927_test.py
@@ -14,7 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX, PLUGIN_ATTR_UNIQUENESS
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket47931_test.py b/dirsrvtests/tests/tickets/ticket47931_test.py
index 82657c9..2387992 100644
--- a/dirsrvtests/tests/tickets/ticket47931_test.py
+++ b/dirsrvtests/tests/tickets/ticket47931_test.py
@@ -8,7 +8,8 @@ from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, PLUGIN_RETRO_CHANGELOG, PLUGIN_MEMBER_OF, BACKEND_NAME
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.3'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket47950_test.py b/dirsrvtests/tests/tickets/ticket47950_test.py
index 7fe62a3..744b801 100644
--- a/dirsrvtests/tests/tickets/ticket47950_test.py
+++ b/dirsrvtests/tests/tickets/ticket47950_test.py
@@ -18,6 +18,8 @@ from lib389._constants import (defaultProperties, DEFAULT_SUFFIX, ReplicaRole,
                                RA_BINDDN, RA_BINDPW, RA_METHOD, RA_TRANSPORT_PROT,
                                DN_DM, PASSWORD, REPLICA_ID, RA_CONSUMER_PORT)
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 USER1_DN = "uid=user1,%s" % DEFAULT_SUFFIX
diff --git a/dirsrvtests/tests/tickets/ticket47953_test.py b/dirsrvtests/tests/tickets/ticket47953_test.py
index 0aebe55..c99a1ca 100644
--- a/dirsrvtests/tests/tickets/ticket47953_test.py
+++ b/dirsrvtests/tests/tickets/ticket47953_test.py
@@ -16,6 +16,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DATA_DIR, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 
diff --git a/dirsrvtests/tests/tickets/ticket47963_test.py b/dirsrvtests/tests/tickets/ticket47963_test.py
index 24f6eea..8736511 100644
--- a/dirsrvtests/tests/tickets/ticket47963_test.py
+++ b/dirsrvtests/tests/tickets/ticket47963_test.py
@@ -15,6 +15,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, PLUGIN_MEMBER_OF
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47966_test.py b/dirsrvtests/tests/tickets/ticket47966_test.py
index ba6f3b6..80e3318 100644
--- a/dirsrvtests/tests/tickets/ticket47966_test.py
+++ b/dirsrvtests/tests/tickets/ticket47966_test.py
@@ -14,6 +14,8 @@ from lib389.topologies import topology_m2
 from lib389._constants import (DEFAULT_SUFFIX, HOST_MASTER_2, PORT_MASTER_2,
                                ReplicaRole, REPLICAID_MASTER_2, BACKEND_NAME)
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket47970_test.py b/dirsrvtests/tests/tickets/ticket47970_test.py
index 410a290..f59405d 100644
--- a/dirsrvtests/tests/tickets/ticket47970_test.py
+++ b/dirsrvtests/tests/tickets/ticket47970_test.py
@@ -13,6 +13,8 @@ import pytest
 from lib389.tasks import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 USER1_DN = "uid=user1,%s" % DEFAULT_SUFFIX
diff --git a/dirsrvtests/tests/tickets/ticket47973_test.py b/dirsrvtests/tests/tickets/ticket47973_test.py
index c73388b..2712156 100644
--- a/dirsrvtests/tests/tickets/ticket47973_test.py
+++ b/dirsrvtests/tests/tickets/ticket47973_test.py
@@ -16,6 +16,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 USER_DN = 'uid=user1,%s' % (DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/tickets/ticket47976_test.py b/dirsrvtests/tests/tickets/ticket47976_test.py
index 850ffe1..47ea709 100644
--- a/dirsrvtests/tests/tickets/ticket47976_test.py
+++ b/dirsrvtests/tests/tickets/ticket47976_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX, PLUGIN_MANAGED_ENTRY, DN_LDBM
 
+pytestmark = pytest.mark.tier2
+
 PEOPLE_OU = 'people'
 PEOPLE_DN = "ou=%s,%s" % (PEOPLE_OU, SUFFIX)
 GROUPS_OU = 'groups'
diff --git a/dirsrvtests/tests/tickets/ticket47980_test.py b/dirsrvtests/tests/tickets/ticket47980_test.py
index 510d679..61cda2f 100644
--- a/dirsrvtests/tests/tickets/ticket47980_test.py
+++ b/dirsrvtests/tests/tickets/ticket47980_test.py
@@ -15,6 +15,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DN_CONFIG, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 BRANCH1 = 'ou=level1,' + DEFAULT_SUFFIX
diff --git a/dirsrvtests/tests/tickets/ticket47981_test.py b/dirsrvtests/tests/tickets/ticket47981_test.py
index b8bc7ca..e8ab9d6 100644
--- a/dirsrvtests/tests/tickets/ticket47981_test.py
+++ b/dirsrvtests/tests/tickets/ticket47981_test.py
@@ -15,6 +15,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, BACKEND_NAME, DN_CONFIG
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 BRANCH = 'ou=people,' + DEFAULT_SUFFIX
diff --git a/dirsrvtests/tests/tickets/ticket47988_test.py b/dirsrvtests/tests/tickets/ticket47988_test.py
index ed61a2a..e3aaee2 100644
--- a/dirsrvtests/tests/tickets/ticket47988_test.py
+++ b/dirsrvtests/tests/tickets/ticket47988_test.py
@@ -25,6 +25,8 @@ from lib389._constants import *
 from lib389.topologies import topology_m2
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48005_test.py b/dirsrvtests/tests/tickets/ticket48005_test.py
index 4474f11..6ad7aaf 100644
--- a/dirsrvtests/tests/tickets/ticket48005_test.py
+++ b/dirsrvtests/tests/tickets/ticket48005_test.py
@@ -16,6 +16,8 @@ from lib389.topologies import topology_st
 from lib389._constants import (DEFAULT_SUFFIX, SUFFIX, PLUGIN_REFER_INTEGRITY, PLUGIN_AUTOMEMBER,
                               PLUGIN_MEMBER_OF, PLUGIN_USN)
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48013_test.py b/dirsrvtests/tests/tickets/ticket48013_test.py
index d5708f2..915d589 100644
--- a/dirsrvtests/tests/tickets/ticket48013_test.py
+++ b/dirsrvtests/tests/tickets/ticket48013_test.py
@@ -19,7 +19,8 @@ from lib389._constants import (PLUGIN_RETRO_CHANGELOG, DEFAULT_SUFFIX, DN_CONFIG
 
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket48026_test.py b/dirsrvtests/tests/tickets/ticket48026_test.py
index 830beee..f00d3d5 100644
--- a/dirsrvtests/tests/tickets/ticket48026_test.py
+++ b/dirsrvtests/tests/tickets/ticket48026_test.py
@@ -14,7 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import PLUGIN_ATTR_UNIQUENESS, DEFAULT_SUFFIX
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket48109_test.py b/dirsrvtests/tests/tickets/ticket48109_test.py
index 6340e8e..5f9b657 100644
--- a/dirsrvtests/tests/tickets/ticket48109_test.py
+++ b/dirsrvtests/tests/tickets/ticket48109_test.py
@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48170_test.py b/dirsrvtests/tests/tickets/ticket48170_test.py
index 8547989..e3c8a27 100644
--- a/dirsrvtests/tests/tickets/ticket48170_test.py
+++ b/dirsrvtests/tests/tickets/ticket48170_test.py
@@ -10,6 +10,8 @@ import pytest
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48194_test.py b/dirsrvtests/tests/tickets/ticket48194_test.py
index b94b726..bd069b7 100644
--- a/dirsrvtests/tests/tickets/ticket48194_test.py
+++ b/dirsrvtests/tests/tickets/ticket48194_test.py
@@ -23,7 +23,8 @@ CONFIG_DN = 'cn=config'
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 ENCRYPTION_DN = 'cn=encryption,%s' % CONFIG_DN
 RSA = 'RSA'
 RSA_DN = 'cn=%s,%s' % (RSA, ENCRYPTION_DN)
diff --git a/dirsrvtests/tests/tickets/ticket48212_test.py b/dirsrvtests/tests/tickets/ticket48212_test.py
index 2fb1007..ee58a82 100644
--- a/dirsrvtests/tests/tickets/ticket48212_test.py
+++ b/dirsrvtests/tests/tickets/ticket48212_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DN_DM, PASSWORD, DEFAULT_SUFFIX, DATA_DIR
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 MYSUFFIX = 'dc=example,dc=com'
diff --git a/dirsrvtests/tests/tickets/ticket48214_test.py b/dirsrvtests/tests/tickets/ticket48214_test.py
index 2f380fd..a2e71f5 100644
--- a/dirsrvtests/tests/tickets/ticket48214_test.py
+++ b/dirsrvtests/tests/tickets/ticket48214_test.py
@@ -6,6 +6,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, DN_DM, PASSWORD
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 MYSUFFIX = 'dc=example,dc=com'
diff --git a/dirsrvtests/tests/tickets/ticket48226_test.py b/dirsrvtests/tests/tickets/ticket48226_test.py
index 8b2b504..f386067 100644
--- a/dirsrvtests/tests/tickets/ticket48226_test.py
+++ b/dirsrvtests/tests/tickets/ticket48226_test.py
@@ -14,6 +14,8 @@ from lib389.topologies import topology_m2
 from lib389._constants import (DEFAULT_SUFFIX, REPLICA_PURGE_DELAY, REPLICA_PURGE_INTERVAL, DN_CONFIG,
                               SUFFIX, VALGRIND_LEAK_STR, VALGRIND_INVALID_STR)
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48228_test.py b/dirsrvtests/tests/tickets/ticket48228_test.py
index 1ab741b..530cd51 100644
--- a/dirsrvtests/tests/tickets/ticket48228_test.py
+++ b/dirsrvtests/tests/tickets/ticket48228_test.py
@@ -15,6 +15,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, DN_DM, PASSWORD, DN_CONFIG
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 # Assuming DEFAULT_SUFFIX is "dc=example,dc=com", otherwise it does not work... :(
diff --git a/dirsrvtests/tests/tickets/ticket48233_test.py b/dirsrvtests/tests/tickets/ticket48233_test.py
index 3c29633..3eee70f 100644
--- a/dirsrvtests/tests/tickets/ticket48233_test.py
+++ b/dirsrvtests/tests/tickets/ticket48233_test.py
@@ -4,6 +4,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48234_test.py b/dirsrvtests/tests/tickets/ticket48234_test.py
index 94faec9..238a2bd 100644
--- a/dirsrvtests/tests/tickets/ticket48234_test.py
+++ b/dirsrvtests/tests/tickets/ticket48234_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, DN_DM, PASSWORD
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48252_test.py b/dirsrvtests/tests/tickets/ticket48252_test.py
index 0d2962d..15ceaf0 100644
--- a/dirsrvtests/tests/tickets/ticket48252_test.py
+++ b/dirsrvtests/tests/tickets/ticket48252_test.py
@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccounts
 
 from lib389._constants import DEFAULT_SUFFIX, SUFFIX, DEFAULT_BENAME, PLUGIN_USN
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 # Assuming DEFAULT_SUFFIX is "dc=example,dc=com", otherwise it does not work... :(
diff --git a/dirsrvtests/tests/tickets/ticket48265_test.py b/dirsrvtests/tests/tickets/ticket48265_test.py
index 68202be..1652b7a 100644
--- a/dirsrvtests/tests/tickets/ticket48265_test.py
+++ b/dirsrvtests/tests/tickets/ticket48265_test.py
@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48266_test.py b/dirsrvtests/tests/tickets/ticket48266_test.py
index 47fef09..e0ed9de 100644
--- a/dirsrvtests/tests/tickets/ticket48266_test.py
+++ b/dirsrvtests/tests/tickets/ticket48266_test.py
@@ -6,6 +6,8 @@ from lib389.replica import ReplicationManager
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX, HOST_MASTER_2, PORT_MASTER_2
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48270_test.py b/dirsrvtests/tests/tickets/ticket48270_test.py
index 5c1592c..3dcbfbf 100644
--- a/dirsrvtests/tests/tickets/ticket48270_test.py
+++ b/dirsrvtests/tests/tickets/ticket48270_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48272_test.py b/dirsrvtests/tests/tickets/ticket48272_test.py
index 6e2f4ca..5d79d28 100644
--- a/dirsrvtests/tests/tickets/ticket48272_test.py
+++ b/dirsrvtests/tests/tickets/ticket48272_test.py
@@ -14,7 +14,8 @@ else:
 
 log = logging.getLogger(__name__)
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 
 USER1 = 'user1'
diff --git a/dirsrvtests/tests/tickets/ticket48294_test.py b/dirsrvtests/tests/tickets/ticket48294_test.py
index 9bba02b..73df896 100644
--- a/dirsrvtests/tests/tickets/ticket48294_test.py
+++ b/dirsrvtests/tests/tickets/ticket48294_test.py
@@ -16,6 +16,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 LINKEDATTR_PLUGIN = 'cn=Linked Attributes,cn=plugins,cn=config'
diff --git a/dirsrvtests/tests/tickets/ticket48295_test.py b/dirsrvtests/tests/tickets/ticket48295_test.py
index f5d17f4..c175b21 100644
--- a/dirsrvtests/tests/tickets/ticket48295_test.py
+++ b/dirsrvtests/tests/tickets/ticket48295_test.py
@@ -15,6 +15,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 LINKEDATTR_PLUGIN = 'cn=Linked Attributes,cn=plugins,cn=config'
diff --git a/dirsrvtests/tests/tickets/ticket48312_test.py b/dirsrvtests/tests/tickets/ticket48312_test.py
index 387b797..d7da6a5 100644
--- a/dirsrvtests/tests/tickets/ticket48312_test.py
+++ b/dirsrvtests/tests/tickets/ticket48312_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, PLUGIN_MANAGED_ENTRY, DN_CONFIG
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48325_test.py b/dirsrvtests/tests/tickets/ticket48325_test.py
index fe70e2e..5108e61 100644
--- a/dirsrvtests/tests/tickets/ticket48325_test.py
+++ b/dirsrvtests/tests/tickets/ticket48325_test.py
@@ -9,6 +9,8 @@ from lib389._constants import (DEFAULT_SUFFIX, REPLICA_RUV_FILTER, defaultProper
                                REPLICATION_TRANSPORT, RA_NAME, RA_BINDDN, RA_BINDPW,
                                RA_METHOD, RA_TRANSPORT_PROT, SUFFIX)
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48342_test.py b/dirsrvtests/tests/tickets/ticket48342_test.py
index c30a557..0db6b5f 100644
--- a/dirsrvtests/tests/tickets/ticket48342_test.py
+++ b/dirsrvtests/tests/tickets/ticket48342_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_m3
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX, PLUGIN_DNA
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48354_test.py b/dirsrvtests/tests/tickets/ticket48354_test.py
index 037d3c8..73cf307 100644
--- a/dirsrvtests/tests/tickets/ticket48354_test.py
+++ b/dirsrvtests/tests/tickets/ticket48354_test.py
@@ -4,6 +4,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, HOST_STANDALONE, PORT_STANDALONE
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 if DEBUGGING:
diff --git a/dirsrvtests/tests/tickets/ticket48362_test.py b/dirsrvtests/tests/tickets/ticket48362_test.py
index edb7cca..ad34801 100644
--- a/dirsrvtests/tests/tickets/ticket48362_test.py
+++ b/dirsrvtests/tests/tickets/ticket48362_test.py
@@ -6,7 +6,8 @@ from lib389.topologies import topology_m2
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX, PLUGIN_DNA
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.4'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket48366_test.py b/dirsrvtests/tests/tickets/ticket48366_test.py
index c860f54..d30697d 100644
--- a/dirsrvtests/tests/tickets/ticket48366_test.py
+++ b/dirsrvtests/tests/tickets/ticket48366_test.py
@@ -20,7 +20,8 @@ log = logging.getLogger(__name__)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")]
 PROXY_USER_DN = 'cn=proxy,ou=people,%s' % SUFFIX
 TEST_USER_DN = 'cn=test,ou=people,%s' % SUFFIX
 USER_PW = 'password'
diff --git a/dirsrvtests/tests/tickets/ticket48370_test.py b/dirsrvtests/tests/tickets/ticket48370_test.py
index df55a17..836888f 100644
--- a/dirsrvtests/tests/tickets/ticket48370_test.py
+++ b/dirsrvtests/tests/tickets/ticket48370_test.py
@@ -3,6 +3,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48383_test.py b/dirsrvtests/tests/tickets/ticket48383_test.py
index f681b83..7d52a8f 100644
--- a/dirsrvtests/tests/tickets/ticket48383_test.py
+++ b/dirsrvtests/tests/tickets/ticket48383_test.py
@@ -8,6 +8,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, SERVERID_STANDALONE
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48497_test.py b/dirsrvtests/tests/tickets/ticket48497_test.py
index 9dea9e8..df10b6b 100644
--- a/dirsrvtests/tests/tickets/ticket48497_test.py
+++ b/dirsrvtests/tests/tickets/ticket48497_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48637_test.py b/dirsrvtests/tests/tickets/ticket48637_test.py
index 1a46698..d33c861 100644
--- a/dirsrvtests/tests/tickets/ticket48637_test.py
+++ b/dirsrvtests/tests/tickets/ticket48637_test.py
@@ -3,6 +3,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 if DEBUGGING:
diff --git a/dirsrvtests/tests/tickets/ticket48665_test.py b/dirsrvtests/tests/tickets/ticket48665_test.py
index d2c0387..4216a3b 100644
--- a/dirsrvtests/tests/tickets/ticket48665_test.py
+++ b/dirsrvtests/tests/tickets/ticket48665_test.py
@@ -4,6 +4,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, DEFAULT_BENAME
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48745_test.py b/dirsrvtests/tests/tickets/ticket48745_test.py
index c40358d..f0bcaa1 100644
--- a/dirsrvtests/tests/tickets/ticket48745_test.py
+++ b/dirsrvtests/tests/tickets/ticket48745_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48746_test.py b/dirsrvtests/tests/tickets/ticket48746_test.py
index e23fc90..f574c49 100644
--- a/dirsrvtests/tests/tickets/ticket48746_test.py
+++ b/dirsrvtests/tests/tickets/ticket48746_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import SUFFIX, DEFAULT_SUFFIX, DEFAULT_BENAME
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48755_test.py b/dirsrvtests/tests/tickets/ticket48755_test.py
index c6e615a..6b83f50 100644
--- a/dirsrvtests/tests/tickets/ticket48755_test.py
+++ b/dirsrvtests/tests/tickets/ticket48755_test.py
@@ -12,6 +12,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_m2
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48759_test.py b/dirsrvtests/tests/tickets/ticket48759_test.py
index 0989c87..f9b2e3b 100644
--- a/dirsrvtests/tests/tickets/ticket48759_test.py
+++ b/dirsrvtests/tests/tickets/ticket48759_test.py
@@ -18,6 +18,8 @@ from lib389._constants import (PLUGIN_MEMBER_OF, DEFAULT_SUFFIX, ReplicaRole, RE
                                PLUGIN_RETRO_CHANGELOG, REPLICA_PRECISE_PURGING, REPLICA_PURGE_DELAY,
                                REPLICA_PURGE_INTERVAL)
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 MEMBEROF_PLUGIN_DN = ('cn=' + PLUGIN_MEMBER_OF + ',cn=plugins,cn=config')
diff --git a/dirsrvtests/tests/tickets/ticket48784_test.py b/dirsrvtests/tests/tickets/ticket48784_test.py
index 051fdb0..8e5b204 100644
--- a/dirsrvtests/tests/tickets/ticket48784_test.py
+++ b/dirsrvtests/tests/tickets/ticket48784_test.py
@@ -11,7 +11,9 @@ from lib389.tasks import *
 
 from lib389.utils import *
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")]
+
 from lib389.topologies import topology_m2
 
 from lib389._constants import DEFAULT_SUFFIX, DN_DM, PASSWORD
diff --git a/dirsrvtests/tests/tickets/ticket48798_test.py b/dirsrvtests/tests/tickets/ticket48798_test.py
index f1f8d98..a513292 100644
--- a/dirsrvtests/tests/tickets/ticket48798_test.py
+++ b/dirsrvtests/tests/tickets/ticket48798_test.py
@@ -8,6 +8,8 @@ from lib389.config import Encryption
 
 from lib389._constants import DEFAULT_SUFFIX, DEFAULT_SECURE_PORT
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48799_test.py b/dirsrvtests/tests/tickets/ticket48799_test.py
index 0e51d42..8d9b7e9 100644
--- a/dirsrvtests/tests/tickets/ticket48799_test.py
+++ b/dirsrvtests/tests/tickets/ticket48799_test.py
@@ -3,6 +3,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_m1c1
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48808_test.py b/dirsrvtests/tests/tickets/ticket48808_test.py
index f5e6c50..7ac5a76 100644
--- a/dirsrvtests/tests/tickets/ticket48808_test.py
+++ b/dirsrvtests/tests/tickets/ticket48808_test.py
@@ -8,6 +8,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, DN_DM, PASSWORD
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48844_test.py b/dirsrvtests/tests/tickets/ticket48844_test.py
index a1fc48c..59e4cbd 100644
--- a/dirsrvtests/tests/tickets/ticket48844_test.py
+++ b/dirsrvtests/tests/tickets/ticket48844_test.py
@@ -5,6 +5,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, BACKEND_NAME
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48891_test.py b/dirsrvtests/tests/tickets/ticket48891_test.py
index ce0d3b7..041ce21 100644
--- a/dirsrvtests/tests/tickets/ticket48891_test.py
+++ b/dirsrvtests/tests/tickets/ticket48891_test.py
@@ -15,6 +15,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DN_DM, PASSWORD, DEFAULT_SUFFIX, BACKEND_NAME, SUFFIX
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 CONFIG_DN = 'cn=config'
diff --git a/dirsrvtests/tests/tickets/ticket48893_test.py b/dirsrvtests/tests/tickets/ticket48893_test.py
index bb945c0..7b811d9 100644
--- a/dirsrvtests/tests/tickets/ticket48893_test.py
+++ b/dirsrvtests/tests/tickets/ticket48893_test.py
@@ -4,6 +4,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, HOST_STANDALONE, PORT_STANDALONE
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 if DEBUGGING:
diff --git a/dirsrvtests/tests/tickets/ticket48896_test.py b/dirsrvtests/tests/tickets/ticket48896_test.py
index 8125af4..a189758 100644
--- a/dirsrvtests/tests/tickets/ticket48896_test.py
+++ b/dirsrvtests/tests/tickets/ticket48896_test.py
@@ -14,7 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, DN_DM, PASSWORD
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket48906_test.py b/dirsrvtests/tests/tickets/ticket48906_test.py
index 3e10b20..8329964 100644
--- a/dirsrvtests/tests/tickets/ticket48906_test.py
+++ b/dirsrvtests/tests/tickets/ticket48906_test.py
@@ -18,7 +18,8 @@ from lib389.utils import *
 from lib389._constants import DEFAULT_SUFFIX, DN_LDBM, DN_DM, PASSWORD, SUFFIX
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket48916_test.py b/dirsrvtests/tests/tickets/ticket48916_test.py
index 24a41b0..3f2da4a 100644
--- a/dirsrvtests/tests/tickets/ticket48916_test.py
+++ b/dirsrvtests/tests/tickets/ticket48916_test.py
@@ -12,7 +12,8 @@ else:
 
 log = logging.getLogger(__name__)
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.5'), reason="Not implemented")]
 
 
 
diff --git a/dirsrvtests/tests/tickets/ticket48944_test.py b/dirsrvtests/tests/tickets/ticket48944_test.py
index 7e63cf2..38f5e2b 100644
--- a/dirsrvtests/tests/tickets/ticket48944_test.py
+++ b/dirsrvtests/tests/tickets/ticket48944_test.py
@@ -14,6 +14,8 @@ from lib389.topologies import topology_m2c2 as topo
 from lib389._constants import (PLUGIN_ACCT_POLICY, DN_PLUGIN, DN_CONFIG, DN_DM, PASSWORD,
                               DEFAULT_SUFFIX, SUFFIX)
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket48956_test.py b/dirsrvtests/tests/tickets/ticket48956_test.py
index 14a6241..a2a1b3a 100644
--- a/dirsrvtests/tests/tickets/ticket48956_test.py
+++ b/dirsrvtests/tests/tickets/ticket48956_test.py
@@ -7,6 +7,8 @@ from lib389.topologies import topology_st
 from lib389._constants import (PLUGIN_ACCT_POLICY, DEFAULT_SUFFIX, DN_DM, PASSWORD, SUFFIX,
                               BACKEND_NAME)
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 RDN_LONG_SUFFIX = 'this'
diff --git a/dirsrvtests/tests/tickets/ticket48961_test.py b/dirsrvtests/tests/tickets/ticket48961_test.py
index 8ee18b9..7011e61 100644
--- a/dirsrvtests/tests/tickets/ticket48961_test.py
+++ b/dirsrvtests/tests/tickets/ticket48961_test.py
@@ -12,7 +12,8 @@ else:
 log = logging.getLogger(__name__)
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 
 def test_ticket48961_storagescheme(topology_st):
diff --git a/dirsrvtests/tests/tickets/ticket48973_test.py b/dirsrvtests/tests/tickets/ticket48973_test.py
index 6af945e..5adca3d 100644
--- a/dirsrvtests/tests/tickets/ticket48973_test.py
+++ b/dirsrvtests/tests/tickets/ticket48973_test.py
@@ -10,6 +10,8 @@ from lib389.properties import *
 from lib389.tasks import *
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket49008_test.py b/dirsrvtests/tests/tickets/ticket49008_test.py
index 22b0542..970f42b 100644
--- a/dirsrvtests/tests/tickets/ticket49008_test.py
+++ b/dirsrvtests/tests/tickets/ticket49008_test.py
@@ -6,7 +6,8 @@ from lib389.topologies import topology_m3 as T
 from lib389._constants import DEFAULT_SUFFIX, PLUGIN_MEMBER_OF
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
diff --git a/dirsrvtests/tests/tickets/ticket49020_test.py b/dirsrvtests/tests/tickets/ticket49020_test.py
index c4f94d5..740c542 100644
--- a/dirsrvtests/tests/tickets/ticket49020_test.py
+++ b/dirsrvtests/tests/tickets/ticket49020_test.py
@@ -12,7 +12,8 @@ from lib389.topologies import topology_m3 as T
 import socket
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
diff --git a/dirsrvtests/tests/tickets/ticket49039_test.py b/dirsrvtests/tests/tickets/ticket49039_test.py
index 377940c..8938b14 100644
--- a/dirsrvtests/tests/tickets/ticket49039_test.py
+++ b/dirsrvtests/tests/tickets/ticket49039_test.py
@@ -12,6 +12,8 @@ from lib389.topologies import topology_st as topo
 from lib389.pwpolicy import PwPolicyManager
 
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49071_test.py b/dirsrvtests/tests/tickets/ticket49071_test.py
index 905e6ff..feccdc2 100644
--- a/dirsrvtests/tests/tickets/ticket49071_test.py
+++ b/dirsrvtests/tests/tickets/ticket49071_test.py
@@ -4,6 +4,8 @@ from lib389.topologies import topology_st as topo
 
 from lib389._constants import DEFAULT_SUFFIX, TASK_WAIT
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49072_test.py b/dirsrvtests/tests/tickets/ticket49072_test.py
index f6329f7..9ec2a55 100644
--- a/dirsrvtests/tests/tickets/ticket49072_test.py
+++ b/dirsrvtests/tests/tickets/ticket49072_test.py
@@ -15,6 +15,8 @@ from lib389.topologies import topology_st as topo
 from lib389._constants import (DEFAULT_SUFFIX, PLUGIN_MEMBER_OF, DN_DM, PASSWORD, SERVERID_STANDALONE,
                               SUFFIX)
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket49073_test.py b/dirsrvtests/tests/tickets/ticket49073_test.py
index c8f273c..23dcff2 100644
--- a/dirsrvtests/tests/tickets/ticket49073_test.py
+++ b/dirsrvtests/tests/tickets/ticket49073_test.py
@@ -7,7 +7,8 @@ from lib389._constants import (PLUGIN_MEMBER_OF, DEFAULT_SUFFIX, SUFFIX, HOST_MA
                               PORT_MASTER_2)
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 DEBUGGING = os.getenv('DEBUGGING', False)
 GROUP_DN = ("cn=group," + DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/tickets/ticket49076_test.py b/dirsrvtests/tests/tickets/ticket49076_test.py
index 3fa6967..74b6312 100644
--- a/dirsrvtests/tests/tickets/ticket49076_test.py
+++ b/dirsrvtests/tests/tickets/ticket49076_test.py
@@ -10,6 +10,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49095_test.py b/dirsrvtests/tests/tickets/ticket49095_test.py
index 4301354..3c49fca 100644
--- a/dirsrvtests/tests/tickets/ticket49095_test.py
+++ b/dirsrvtests/tests/tickets/ticket49095_test.py
@@ -10,6 +10,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49104_test.py b/dirsrvtests/tests/tickets/ticket49104_test.py
index 4c74bd7..08458ab 100644
--- a/dirsrvtests/tests/tickets/ticket49104_test.py
+++ b/dirsrvtests/tests/tickets/ticket49104_test.py
@@ -15,7 +15,8 @@ from lib389.utils import *
 from lib389.topologies import topology_st
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 log = logging.getLogger(__name__)
 
 def test_ticket49104_setup(topology_st):
diff --git a/dirsrvtests/tests/tickets/ticket49121_test.py b/dirsrvtests/tests/tickets/ticket49121_test.py
index 931ab88..c597085 100644
--- a/dirsrvtests/tests/tickets/ticket49121_test.py
+++ b/dirsrvtests/tests/tickets/ticket49121_test.py
@@ -15,7 +15,8 @@ from lib389.topologies import topology_m2
 from lib389._constants import DATA_DIR, DEFAULT_SUFFIX, VALGRIND_INVALID_STR
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 DEBUGGING = os.getenv('DEBUGGING', False)
 
diff --git a/dirsrvtests/tests/tickets/ticket49122_test.py b/dirsrvtests/tests/tickets/ticket49122_test.py
index 0945122..651cd50 100644
--- a/dirsrvtests/tests/tickets/ticket49122_test.py
+++ b/dirsrvtests/tests/tickets/ticket49122_test.py
@@ -9,6 +9,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49180_test.py b/dirsrvtests/tests/tickets/ticket49180_test.py
index 0c74a69..4c8f7de 100644
--- a/dirsrvtests/tests/tickets/ticket49180_test.py
+++ b/dirsrvtests/tests/tickets/ticket49180_test.py
@@ -18,6 +18,8 @@ from lib389._constants import (DEFAULT_SUFFIX, SUFFIX)
 
 from lib389 import DirSrv
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket49184_test.py b/dirsrvtests/tests/tickets/ticket49184_test.py
index 7992e61..4ec78b3 100644
--- a/dirsrvtests/tests/tickets/ticket49184_test.py
+++ b/dirsrvtests/tests/tickets/ticket49184_test.py
@@ -10,6 +10,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 GROUP_DN_1 = ("cn=group1," + DEFAULT_SUFFIX)
 GROUP_DN_2 = ("cn=group2," + DEFAULT_SUFFIX)
diff --git a/dirsrvtests/tests/tickets/ticket49192_test.py b/dirsrvtests/tests/tickets/ticket49192_test.py
index 6d2866e..21be4eb 100644
--- a/dirsrvtests/tests/tickets/ticket49192_test.py
+++ b/dirsrvtests/tests/tickets/ticket49192_test.py
@@ -9,6 +9,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49227_test.py b/dirsrvtests/tests/tickets/ticket49227_test.py
index 2d83ddb..c828c2d 100644
--- a/dirsrvtests/tests/tickets/ticket49227_test.py
+++ b/dirsrvtests/tests/tickets/ticket49227_test.py
@@ -9,6 +9,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49249_test.py b/dirsrvtests/tests/tickets/ticket49249_test.py
index 1dfd07e..83d2259 100644
--- a/dirsrvtests/tests/tickets/ticket49249_test.py
+++ b/dirsrvtests/tests/tickets/ticket49249_test.py
@@ -10,6 +10,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49273_test.py b/dirsrvtests/tests/tickets/ticket49273_test.py
index c50aaee..e3213bd 100644
--- a/dirsrvtests/tests/tickets/ticket49273_test.py
+++ b/dirsrvtests/tests/tickets/ticket49273_test.py
@@ -16,6 +16,8 @@ from lib389.utils import *
 from lib389.sasl import PlainSASL
 from lib389.idm.services import ServiceAccounts
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 def test_49273_corrupt_dbversion(topology_st):
diff --git a/dirsrvtests/tests/tickets/ticket49287_test.py b/dirsrvtests/tests/tickets/ticket49287_test.py
index e3da788..28fd8db 100644
--- a/dirsrvtests/tests/tickets/ticket49287_test.py
+++ b/dirsrvtests/tests/tickets/ticket49287_test.py
@@ -14,6 +14,8 @@ from lib389.topologies import topology_m2
 from lib389._constants import *
 from lib389.replica import ReplicationManager
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 GROUP_DN = ("cn=group," + DEFAULT_SUFFIX)
 
diff --git a/dirsrvtests/tests/tickets/ticket49290_test.py b/dirsrvtests/tests/tickets/ticket49290_test.py
index fcf6b0e..fe47d18 100644
--- a/dirsrvtests/tests/tickets/ticket49290_test.py
+++ b/dirsrvtests/tests/tickets/ticket49290_test.py
@@ -15,6 +15,8 @@ from lib389._constants import DEFAULT_SUFFIX, DEFAULT_BENAME
 
 from lib389.backend import Backends
 
+pytestmark = pytest.mark.tier2
+
 def test_49290_range_unindexed_notes(topology_st):
     """
     Ticket 49290 had a small collection of issues - the primary issue is
diff --git a/dirsrvtests/tests/tickets/ticket49303_test.py b/dirsrvtests/tests/tickets/ticket49303_test.py
index 70cbfa6..2ee7eb5 100644
--- a/dirsrvtests/tests/tickets/ticket49303_test.py
+++ b/dirsrvtests/tests/tickets/ticket49303_test.py
@@ -16,6 +16,8 @@ from lib389.nss_ssl import NssSsl
 
 from lib389._constants import SECUREPORT_STANDALONE1, HOST_STANDALONE1
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49386_test.py b/dirsrvtests/tests/tickets/ticket49386_test.py
index bbf5c7b..b416e9e 100644
--- a/dirsrvtests/tests/tickets/ticket49386_test.py
+++ b/dirsrvtests/tests/tickets/ticket49386_test.py
@@ -9,7 +9,8 @@ from lib389._constants import *
 from lib389.config import Config
 from lib389 import Entry
 
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")]
 
 USER_CN='user_'
 GROUP_CN='group_'
diff --git a/dirsrvtests/tests/tickets/ticket49412_test.py b/dirsrvtests/tests/tickets/ticket49412_test.py
new file mode 100644
index 0000000..c529913
--- /dev/null
+++ b/dirsrvtests/tests/tickets/ticket49412_test.py
@@ -0,0 +1,67 @@
+import logging
+import pytest
+import os
+import ldap
+import time
+from lib389._constants import *
+from lib389.topologies import topology_m1c1 as topo
+from lib389._constants import *
+from lib389 import Entry
+
+pytestmark = pytest.mark.tier2
+
+DEBUGGING = os.getenv("DEBUGGING", default=False)
+if DEBUGGING:
+    logging.getLogger(__name__).setLevel(logging.DEBUG)
+else:
+    logging.getLogger(__name__).setLevel(logging.INFO)
+log = logging.getLogger(__name__)
+CHANGELOG = 'cn=changelog5,cn=config'
+MAXAGE_ATTR = 'nsslapd-changelogmaxage'
+TRIMINTERVAL = 'nsslapd-changelogtrim-interval'
+
+
+
+def test_ticket49412(topo):
+    """Specify a test case purpose or name here
+
+    :id: 4c7681ff-0511-4256-9589-bdcad84c13e6
+    :setup: Fill in set up configuration here
+    :steps:
+        1. Fill in test case steps here
+        2. And indent them like this (RST format requirement)
+    :expectedresults:
+        1. Fill in the result that is expected
+        2. For each test step
+    """
+
+    M1 = topo.ms["master1"]
+
+    # wrong call with invalid value (should be str(60)
+    # that create replace with NULL value
+    # it should fail with UNWILLING_TO_PERFORM
+    try:
+        M1.modify_s(CHANGELOG, [(ldap.MOD_REPLACE, MAXAGE_ATTR, 60),
+                                (ldap.MOD_REPLACE, TRIMINTERVAL, 10)])
+        assert(False)
+    except ldap.UNWILLING_TO_PERFORM:
+        pass
+
+    # If you need any test suite initialization,
+    # please, write additional fixture for that (including finalizer).
+    # Topology for suites are predefined in lib389/topologies.py.
+
+    # If you need host, port or any other data about instance,
+    # Please, use the instance object attributes for that (for example, topo.ms["master1"].serverid)
+
+    if DEBUGGING:
+        # Add debugging steps(if any)...
+        pass
+
+
+if __name__ == '__main__':
+    # Run isolated
+    # -s for DEBUG mode
+    CURRENT_FILE = os.path.realpath(__file__)
+    pytest.main("-s %s" % CURRENT_FILE)
+
diff --git a/dirsrvtests/tests/tickets/ticket49412_tests.py b/dirsrvtests/tests/tickets/ticket49412_tests.py
deleted file mode 100644
index da15a28..0000000
--- a/dirsrvtests/tests/tickets/ticket49412_tests.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import logging
-import pytest
-import os
-import ldap
-import time
-from lib389._constants import *
-from lib389.topologies import topology_m1c1 as topo
-from lib389._constants import *
-from lib389 import Entry
-
-DEBUGGING = os.getenv("DEBUGGING", default=False)
-if DEBUGGING:
-    logging.getLogger(__name__).setLevel(logging.DEBUG)
-else:
-    logging.getLogger(__name__).setLevel(logging.INFO)
-log = logging.getLogger(__name__)
-CHANGELOG = 'cn=changelog5,cn=config'
-MAXAGE_ATTR = 'nsslapd-changelogmaxage'
-TRIMINTERVAL = 'nsslapd-changelogtrim-interval'
-
-
-
-def test_ticket49412(topo):
-    """Specify a test case purpose or name here
-
-    :id: 4c7681ff-0511-4256-9589-bdcad84c13e6
-    :setup: Fill in set up configuration here
-    :steps:
-        1. Fill in test case steps here
-        2. And indent them like this (RST format requirement)
-    :expectedresults:
-        1. Fill in the result that is expected
-        2. For each test step
-    """
-
-    M1 = topo.ms["master1"]
-
-    # wrong call with invalid value (should be str(60)
-    # that create replace with NULL value
-    # it should fail with UNWILLING_TO_PERFORM
-    try:
-        M1.modify_s(CHANGELOG, [(ldap.MOD_REPLACE, MAXAGE_ATTR, 60),
-                                (ldap.MOD_REPLACE, TRIMINTERVAL, 10)])
-        assert(False)
-    except ldap.UNWILLING_TO_PERFORM:
-        pass
-
-    # If you need any test suite initialization,
-    # please, write additional fixture for that (including finalizer).
-    # Topology for suites are predefined in lib389/topologies.py.
-
-    # If you need host, port or any other data about instance,
-    # Please, use the instance object attributes for that (for example, topo.ms["master1"].serverid)
-
-    if DEBUGGING:
-        # Add debugging steps(if any)...
-        pass
-
-
-if __name__ == '__main__':
-    # Run isolated
-    # -s for DEBUG mode
-    CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s %s" % CURRENT_FILE)
-
diff --git a/dirsrvtests/tests/tickets/ticket49441_test.py b/dirsrvtests/tests/tickets/ticket49441_test.py
index e50ebc1..7beda62 100644
--- a/dirsrvtests/tests/tickets/ticket49441_test.py
+++ b/dirsrvtests/tests/tickets/ticket49441_test.py
@@ -6,6 +6,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st as topo
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49460_test.py b/dirsrvtests/tests/tickets/ticket49460_test.py
index 296b3c9..b642663 100644
--- a/dirsrvtests/tests/tickets/ticket49460_test.py
+++ b/dirsrvtests/tests/tickets/ticket49460_test.py
@@ -9,6 +9,8 @@ from lib389.config import Config
 from lib389 import DirSrv, Entry
 from lib389.topologies import topology_m3 as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49463_test.py b/dirsrvtests/tests/tickets/ticket49463_test.py
index 1e3bd48..5c603ed 100644
--- a/dirsrvtests/tests/tickets/ticket49463_test.py
+++ b/dirsrvtests/tests/tickets/ticket49463_test.py
@@ -13,6 +13,7 @@ from lib389.idm.user import UserAccounts, UserAccount
 from lib389.tasks import *
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier2
 
 USER_CN = "test_user"
 
@@ -224,4 +225,4 @@ if __name__ == '__main__':
     # -s for DEBUG mode
     CURRENT_FILE = os.path.realpath(__file__)
     pytest.main("-s %s" % CURRENT_FILE)
-    
\ No newline at end of file
+    
diff --git a/dirsrvtests/tests/tickets/ticket49471_test.py b/dirsrvtests/tests/tickets/ticket49471_test.py
index 0456a51..dcab15f 100644
--- a/dirsrvtests/tests/tickets/ticket49471_test.py
+++ b/dirsrvtests/tests/tickets/ticket49471_test.py
@@ -7,6 +7,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st as topo
 from lib389 import Entry
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49540_test.py b/dirsrvtests/tests/tickets/ticket49540_test.py
index 1fbfde2..36fd967 100644
--- a/dirsrvtests/tests/tickets/ticket49540_test.py
+++ b/dirsrvtests/tests/tickets/ticket49540_test.py
@@ -10,7 +10,7 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.user import UserAccount, UserAccounts, TEST_USER_PROPERTIES
 from lib389 import Entry
 
-
+pytestmark = pytest.mark.tier2
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
diff --git a/dirsrvtests/tests/tickets/ticket49658_test.py b/dirsrvtests/tests/tickets/ticket49658_test.py
index 53522df..28ed09f 100644
--- a/dirsrvtests/tests/tickets/ticket49658_test.py
+++ b/dirsrvtests/tests/tickets/ticket49658_test.py
@@ -10,6 +10,8 @@ from lib389._constants import DEFAULT_SUFFIX
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.topologies import topology_m3 as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)
diff --git a/dirsrvtests/tests/tickets/ticket49788_test.py b/dirsrvtests/tests/tickets/ticket49788_test.py
index 8ca3f85..6637957 100644
--- a/dirsrvtests/tests/tickets/ticket49788_test.py
+++ b/dirsrvtests/tests/tickets/ticket49788_test.py
@@ -13,6 +13,8 @@ from lib389.properties import *
 from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, DN_CONFIG, DN_DM, PASSWORD, DEFAULT_SUFFIX_ESCAPED
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket50078_test.py b/dirsrvtests/tests/tickets/ticket50078_test.py
index 3f6c5ec..1316467 100644
--- a/dirsrvtests/tests/tickets/ticket50078_test.py
+++ b/dirsrvtests/tests/tickets/ticket50078_test.py
@@ -8,6 +8,8 @@ from lib389._constants import (DEFAULT_SUFFIX, REPLICA_RUV_FILTER, defaultProper
                               REPLICATION_TRANSPORT, SUFFIX, RA_NAME, RA_BINDDN, RA_BINDPW,
                               RA_METHOD, RA_TRANSPORT_PROT, SUFFIX)
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 
diff --git a/dirsrvtests/tests/tickets/ticket50232_test.py b/dirsrvtests/tests/tickets/ticket50232_test.py
index 133ed0d..64d2c21 100644
--- a/dirsrvtests/tests/tickets/ticket50232_test.py
+++ b/dirsrvtests/tests/tickets/ticket50232_test.py
@@ -20,6 +20,8 @@ from lib389.idm.user import UserAccounts
 from lib389.idm.organization import Organization
 from lib389.idm.organizationalunit import OrganizationalUnit
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 NORMAL_SUFFIX = 'o=normal'
diff --git a/dirsrvtests/tests/tickets/ticket50234_test.py b/dirsrvtests/tests/tickets/ticket50234_test.py
index c605c45..ac936d4 100644
--- a/dirsrvtests/tests/tickets/ticket50234_test.py
+++ b/dirsrvtests/tests/tickets/ticket50234_test.py
@@ -18,6 +18,8 @@ from lib389._constants import DEFAULT_SUFFIX
 from lib389.idm.user import UserAccount, UserAccounts
 from lib389.idm.organizationalunit import OrganizationalUnit
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 def test_ticket50234(topology_st):
diff --git a/dirsrvtests/tests/tickets/ticket548_test.py b/dirsrvtests/tests/tickets/ticket548_test.py
index 0d71ab6..cac3cc5 100644
--- a/dirsrvtests/tests/tickets/ticket548_test.py
+++ b/dirsrvtests/tests/tickets/ticket548_test.py
@@ -14,7 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, DN_CONFIG, DN_DM, PASSWORD, DEFAULT_SUFFIX_ESCAPED
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")
+pytestmark = [pytest.mark.tier2,
+              pytest.mark.skipif(ds_is_older('1.3.6'), reason="Not implemented")]
 
 log = logging.getLogger(__name__)