diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 664559ad1d0..5a4af2194ef 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -47,16 +47,21 @@
     <tika.version>1.1</tika.version>
     <httpcomponents.version>4.1.3</httpcomponents.version>
 
-    <tests.asserts.gracious>false</tests.asserts.gracious>
+    <!-- RandomizedTesting library system properties -->
+    <tests.iters>1</tests.iters>
+    <tests.seed/>
+    <tests.nightly/>
+    <tests.weekly/>
+    <tests.awaitsfix/>
+    <tests.slow/>
+
+    <!-- Lucene/Solr-specific test system properties -->
     <tests.codec>random</tests.codec>
     <tests.directory>random</tests.directory>
-    <tests.iter>1</tests.iter>
-    <tests.iter.min>1</tests.iter.min>
     <tests.locale>random</tests.locale>
     <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
     <tests.multiplier>1</tests.multiplier>
     <tests.postingsformat>random</tests.postingsformat>
-    <tests.seed>random</tests.seed>
     <tests.timezone>random</tests.timezone>
     <tests.verbose>false</tests.verbose>
     <tests.infostream>${tests.verbose}</tests.infostream>
@@ -472,22 +477,28 @@
             <workingDirectory>${project.build.directory}/test</workingDirectory>
             <argLine>-Xmx512M</argLine>
             <systemPropertyVariables>
+              <tempDir>.</tempDir>
+
               <!-- See <http://wiki.apache.org/lucene-java/RunningTests>
                    for a description of the tests.* system properties. -->
-              <tempDir>.</tempDir>
+
+              <!-- RandomizedTesting library system properties -->
+              <tests.iters>${tests.iters}</tests.iters>
+              <tests.seed>${tests.seed}</tests.seed>
+              <tests.nightly>${tests.nightly}</tests.nightly>
+              <tests.weekly>${tests.weekly}</tests.weekly>
+              <tests.awaitsfix>${tests.awaitsfix}</tests.awaitsfix>
+              <tests.slow>${tests.slow}</tests.slow>
+
+              <!-- Lucene/Solr-specific test system properties -->
               <jetty.testMode>1</jetty.testMode>
-              <tests.asserts.gracious>${tests.asserts.gracious}</tests.asserts.gracious>
               <tests.codec>${tests.codec}</tests.codec>
               <tests.directory>${tests.directory}</tests.directory>
               <tests.infostream>${tests.infostream}</tests.infostream>
-              <tests.iter>${tests.iter}</tests.iter>
-              <tests.iter.min>${tests.iter.min}</tests.iter.min>
               <tests.locale>${tests.locale}</tests.locale>
               <tests.luceneMatchVersion>${tests.luceneMatchVersion}</tests.luceneMatchVersion>
               <tests.multiplier>${tests.multiplier}</tests.multiplier>
-              <tests.nightly>${tests.nightly}</tests.nightly>
               <tests.postingsformat>${tests.postingsformat}</tests.postingsformat>
-              <tests.seed>${tests.seed}</tests.seed>
               <tests.timezone>${tests.timezone}</tests.timezone>
               <tests.verbose>${tests.verbose}</tests.verbose>
             </systemPropertyVariables>