diff --git a/src/test/groovy/net/fortuna/ical4j/data/CalendarBuilderSpec.groovy b/src/test/groovy/net/fortuna/ical4j/data/CalendarBuilderSpec.groovy
index e3454a27a..b0d9397ad 100644
--- a/src/test/groovy/net/fortuna/ical4j/data/CalendarBuilderSpec.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/data/CalendarBuilderSpec.groovy
@@ -11,6 +11,11 @@ import java.nio.charset.Charset
  */
 class CalendarBuilderSpec extends Specification {
 
+    def cleanup() {
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_UNFOLDING)
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)
+    }
+
     def 'test relaxed parsing'() {
         given: 'a calendar object string'
         String cal2 = getClass().getResource('test-relaxed-parsing.ics').text
diff --git a/src/test/groovy/net/fortuna/ical4j/model/ParameterBuilderTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/ParameterBuilderTest.groovy
index 3e7e04a79..1a99d95ec 100644
--- a/src/test/groovy/net/fortuna/ical4j/model/ParameterBuilderTest.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/model/ParameterBuilderTest.groovy
@@ -11,6 +11,10 @@ class ParameterBuilderTest extends Specification {
         CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, false)
     }
 
+    def cleanupSpec() {
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)
+    }
+
     def 'test build parameter'() {
         given: 'a parameter builder instance'
         ParameterBuilder builder = [Arrays.asList(new Value.Factory())]
diff --git a/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy
index da25ba884..3134234ea 100644
--- a/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy
@@ -11,6 +11,10 @@ import java.time.temporal.ChronoUnit
 
 class TemporalAmountAdapterTest extends Specification {
 
+    def cleanup() {
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)
+    }
+
     def "verify string representation"() {
         setup: 'Set default seed date for test consistency'
         def seed = LocalDateTime.parse("2021-04-01T00:00:00")
diff --git a/src/test/groovy/net/fortuna/ical4j/model/property/PrioritySpec.groovy b/src/test/groovy/net/fortuna/ical4j/model/property/PrioritySpec.groovy
index f0b04a2dd..6ab3fbb73 100644
--- a/src/test/groovy/net/fortuna/ical4j/model/property/PrioritySpec.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/model/property/PrioritySpec.groovy
@@ -8,6 +8,10 @@ class PrioritySpec extends Specification {
 
     Priority.Factory factory = []
 
+    def cleanup() {
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)
+    }
+
     def 'test factory use of constants'() {
         when: 'factory is invoked with a constant value'
         def priority = factory.createProperty(new ParameterList(), value)
diff --git a/src/test/java/net/fortuna/ical4j/model/DateTimeTest.java b/src/test/java/net/fortuna/ical4j/model/DateTimeTest.java
index 0925237e6..39fc821c4 100644
--- a/src/test/java/net/fortuna/ical4j/model/DateTimeTest.java
+++ b/src/test/java/net/fortuna/ical4j/model/DateTimeTest.java
@@ -99,6 +99,12 @@ protected void setUp() throws Exception {
         CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, false);
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING);
+    }
+
     /**
      *
      */
@@ -140,8 +146,6 @@ public void testRelaxed() throws Exception {
             assertEquals(this.expectedToString, dt.toString());
         } catch (ParseException pe) {
             fail("exception not expected with relaxed parsing is used");
-        } finally {
-            CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING);
         }
     }
 
diff --git a/src/test/java/net/fortuna/ical4j/model/ParameterFactoryImplTest.java b/src/test/java/net/fortuna/ical4j/model/ParameterFactoryImplTest.java
index de332cca3..ab55065f8 100644
--- a/src/test/java/net/fortuna/ical4j/model/ParameterFactoryImplTest.java
+++ b/src/test/java/net/fortuna/ical4j/model/ParameterFactoryImplTest.java
@@ -49,6 +49,13 @@ public class ParameterFactoryImplTest extends TestCase {
 
     private Logger log = LoggerFactory.getLogger(ParameterFactoryImplTest.class);
 
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING);
+    }
+
     /**
      * @throws Exception
      */
@@ -89,7 +96,5 @@ public void testRelaxedParsing() throws Exception {
         CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true);
 
         new ParameterFactoryImpl().createParameter("VVENUE", "My Place");
-
-        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING);
     }
 }
diff --git a/src/test/java/net/fortuna/ical4j/model/component/CalendarComponentTest.java b/src/test/java/net/fortuna/ical4j/model/component/CalendarComponentTest.java
index 3d10e8a8e..f59d48ef0 100644
--- a/src/test/java/net/fortuna/ical4j/model/component/CalendarComponentTest.java
+++ b/src/test/java/net/fortuna/ical4j/model/component/CalendarComponentTest.java
@@ -70,6 +70,12 @@ public CalendarComponentTest(String testMethod, CalendarComponent component,
         this.component = component;
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION);
+    }
+
     /**
      * Test component iTIP METHOD validation.
      */
diff --git a/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java b/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java
index 95116a089..76e72ec6c 100644
--- a/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java
+++ b/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java
@@ -131,6 +131,9 @@ public void setUp() throws Exception {
     protected void tearDown() throws Exception {
         // relax validation to avoid UID requirement..
         CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION);
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING);
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_UNFOLDING);
+        CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_NOTES_COMPATIBILITY);
         super.tearDown();
     }