diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index ba46412b95..38de21f06d 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -19,6 +19,13 @@ on:
   # Run every day at 00:00
   schedule:
     - cron: "0 0 * * *"
+  # Run on pull requests for selected modules
+  pull_request:
+    paths:
+      - 'nifi-api/**'
+      - 'nifi-framework-api/**'
+      - 'nifi-nar-bundles/nifi-framework-bundle/**'
+      - 'nifi-system-tests/**'
 
 env:
   DEFAULT_MAVEN_OPTS: >-
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/bootstrap.conf b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/bootstrap.conf
index 7cbf25f12e..18fd125f9d 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/bootstrap.conf
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/bootstrap.conf
@@ -17,17 +17,12 @@
 lib.dir=../nifi-lib-assembly/lib
 conf.dir=./conf
 working.dir=./target/node1
-#java=/Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home/bin/java
 
 # How long to wait after telling NiFi to shutdown before explicitly killing the Process
 graceful.shutdown.seconds=20
 
 # JVM memory settings
-java.arg.2= -Xms384m
-java.arg.3=-Xmx384m
+java.arg.2= -Xms512m
+java.arg.3=-Xmx512m
 
 java.arg.14=-Djava.awt.headless=true
-
-#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8002
-
-nifi.bootstrap.sensitive.key=
\ No newline at end of file
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/bootstrap.conf b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/bootstrap.conf
index 263f5e08cb..4b4f5c3977 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/bootstrap.conf
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/bootstrap.conf
@@ -17,17 +17,12 @@
 lib.dir=../nifi-lib-assembly/lib
 conf.dir=./conf
 working.dir=./target/node2
-#java=/Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home/bin/java
 
 # How long to wait after telling NiFi to shutdown before explicitly killing the Process
 graceful.shutdown.seconds=20
 
 # JVM memory settings
-java.arg.2= -Xms384m
-java.arg.3=-Xmx384m
+java.arg.2= -Xms512m
+java.arg.3=-Xmx512m
 
 java.arg.14=-Djava.awt.headless=true
-
-#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8003
-
-nifi.bootstrap.sensitive.key=
\ No newline at end of file
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/bootstrap.conf b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/bootstrap.conf
index f6723ed69e..0af207a49a 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/bootstrap.conf
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/bootstrap.conf
@@ -17,17 +17,12 @@
 lib.dir=../nifi-lib-assembly/lib
 conf.dir=./conf
 working.dir=./target/standalone-instance
-#java=/Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home/bin/java
 
 # How long to wait after telling NiFi to shutdown before explicitly killing the Process
 graceful.shutdown.seconds=20
 
 # JVM memory settings
-java.arg.2= -Xms384m
-java.arg.3=-Xmx384m
+java.arg.2= -Xms512m
+java.arg.3=-Xmx512m
 
 java.arg.14=-Djava.awt.headless=true
-
-#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8002
-
-nifi.bootstrap.sensitive.key=
\ No newline at end of file