diff --git a/src/test/java/picocli/AutoCompleteTest.java b/src/test/java/picocli/AutoCompleteTest.java
index dab6013c0..094baa23b 100644
--- a/src/test/java/picocli/AutoCompleteTest.java
+++ b/src/test/java/picocli/AutoCompleteTest.java
@@ -67,11 +67,10 @@
 // http://hayne.net/MacDev/Notes/unixFAQ.html#shellStartup
 // https://apple.stackexchange.com/a/13019
 public class AutoCompleteTest {
-    @BeforeClass
-    public static void beforeClass() {
-        // https://github.com/remkop/picocli/issues/1503
-        System.setProperty("java.security.manager", "allow");
-    }
+
+    @Rule
+    // https://github.com/remkop/picocli/issues/1503
+    public final ProvideSystemProperty allowSecurityManager = new ProvideSystemProperty("java.security.manager", "allow");
 
     @Rule
     public final ProvideSystemProperty ansiOFF = new ProvideSystemProperty("picocli.ansi", "false");
diff --git a/src/test/java/picocli/ExecuteLegacyTest.java b/src/test/java/picocli/ExecuteLegacyTest.java
index d70d397a1..4d150a99b 100644
--- a/src/test/java/picocli/ExecuteLegacyTest.java
+++ b/src/test/java/picocli/ExecuteLegacyTest.java
@@ -25,7 +25,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -37,11 +36,9 @@
 
 @SuppressWarnings("deprecation")
 public class ExecuteLegacyTest {
-    @BeforeClass
-    public static void beforeClass() {
-        // https://github.com/remkop/picocli/issues/1503
-        System.setProperty("java.security.manager", "allow");
-    }
+    @Rule
+    // https://github.com/remkop/picocli/issues/1503
+    public final ProvideSystemProperty allowSecurityManager = new ProvideSystemProperty("java.security.manager", "allow");
 
     // allows tests to set any kind of properties they like, without having to individually roll them back
     @Rule