diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml
index 3d069a90c3d..207c1806dc4 100644
--- a/dev-tools/idea/.idea/libraries/JUnit.xml
+++ b/dev-tools/idea/.idea/libraries/JUnit.xml
@@ -2,7 +2,7 @@
   <library name="JUnit">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.6.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 72d29844430..b2cf1c290c3 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -445,7 +445,7 @@
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 081849a2fa2..28acddebefc 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -817,9 +817,11 @@
             -->
         </junit4:pickfromlist>
         
+        <mkdir dir="@{tempDir}/temp" />
+        
         <junit4:junit4
             dir="@{tempDir}"
-            tempdir="@{tempDir}"
+            tempdir="@{tempDir}/temp"
             maxmemory="${tests.heapsize}" 
             
             parallelism="@{threadNum}"
@@ -893,7 +895,7 @@
             <sysproperty key="java.io.tmpdir" value="." />
 
             <!-- Restrict access to certain Java features and install security manager: -->
-            <sysproperty key="tests.sandbox.dir" file="${tests.tempDir}" />
+            <sysproperty key="junit4.tempDir" file="@{tempDir}/temp" />
             <sysproperty key="clover.db.dir" file="${clover.db.dir}" />
             <sysproperty key="java.security.manager" value="org.apache.lucene.util.TestSecurityManager" />
             <sysproperty key="java.security.policy" file="${common.dir}/tools/junit4/tests.policy" />
@@ -2041,7 +2043,7 @@ The following arguments can be provided to ant to alter its behaviour and target
 
         <junit4:pickseed property="pitest.seed" />
 
-        <property name="pitest.sysprops" value="-Dlucene.version=${dev.version},-Dtest.seed=${pitest.seed},-Djava.security.manager,-Djava.security.policy=${common.dir}/tools/junit4/tests.policy,-Djava.io.tmpdir=${tests.tempDir},-Dtests.sandbox.dir=${build.dir}" />
+        <property name="pitest.sysprops" value="-Dlucene.version=${dev.version},-Dtest.seed=${pitest.seed},-Djava.security.manager=org.apache.lucene.util.TestSecurityManager,-Djava.security.policy=${common.dir}/tools/junit4/tests.policy,-Djava.io.tmpdir=${tests.tempDir},-Djunit4.childvm.cwd=${tests.tempDir},-Djunit4.tempDir=${tests.tempDir}" />
 
         <pitest
             classPath="pitest.classpath"
diff --git a/lucene/licenses/junit4-ant-2.0.5.jar.sha1 b/lucene/licenses/junit4-ant-2.0.5.jar.sha1
deleted file mode 100644
index 3422b74d9ba..00000000000
--- a/lucene/licenses/junit4-ant-2.0.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f744c50364e7c07567f5b9a0af068c8dd134ae62
diff --git a/lucene/licenses/junit4-ant-2.0.6.jar.sha1 b/lucene/licenses/junit4-ant-2.0.6.jar.sha1
new file mode 100644
index 00000000000..4cc0dad754e
--- /dev/null
+++ b/lucene/licenses/junit4-ant-2.0.6.jar.sha1
@@ -0,0 +1 @@
+a882c0bc45fd2dcf8ef2fb1d440f15379619e3d7
diff --git a/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
deleted file mode 100644
index 77da5f177a8..00000000000
--- a/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a5be67e2cb2798850ecf2609115d660d85b98bc
diff --git a/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1
new file mode 100644
index 00000000000..4165cf3a518
--- /dev/null
+++ b/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1
@@ -0,0 +1 @@
+527f551a232c39bf78f4862feb4126ce9cdb02c9
diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml
index 81fc4fbaac2..0b07eae8ada 100644
--- a/lucene/test-framework/ivy.xml
+++ b/lucene/test-framework/ivy.xml
@@ -32,8 +32,8 @@
       <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
 
       <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.6" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.6" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>
diff --git a/lucene/tools/junit4/tests.policy b/lucene/tools/junit4/tests.policy
index f593550f67b..d89461a42d4 100644
--- a/lucene/tools/junit4/tests.policy
+++ b/lucene/tools/junit4/tests.policy
@@ -26,7 +26,9 @@
 grant {
   // permissions for file access, write access only to sandbox:
   permission java.io.FilePermission "<<ALL FILES>>", "read,execute";
-  permission java.io.FilePermission "${tests.sandbox.dir}${/}-", "read,execute,write,delete";
+  permission java.io.FilePermission "${junit4.childvm.cwd}", "read,execute,write";
+  permission java.io.FilePermission "${junit4.childvm.cwd}${/}-", "read,execute,write,delete";
+  permission java.io.FilePermission "${junit4.tempDir}${/}*", "read,execute,write,delete";
   permission java.io.FilePermission "${clover.db.dir}${/}-", "read,execute,write,delete";
   
   // all possibilities of accepting/binding connections on localhost with ports >=1024:
diff --git a/solr/licenses/junit4-ant-2.0.5.jar.sha1 b/solr/licenses/junit4-ant-2.0.5.jar.sha1
deleted file mode 100644
index 3422b74d9ba..00000000000
--- a/solr/licenses/junit4-ant-2.0.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f744c50364e7c07567f5b9a0af068c8dd134ae62
diff --git a/solr/licenses/junit4-ant-2.0.6.jar.sha1 b/solr/licenses/junit4-ant-2.0.6.jar.sha1
new file mode 100644
index 00000000000..4cc0dad754e
--- /dev/null
+++ b/solr/licenses/junit4-ant-2.0.6.jar.sha1
@@ -0,0 +1 @@
+a882c0bc45fd2dcf8ef2fb1d440f15379619e3d7
diff --git a/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1
deleted file mode 100644
index 77da5f177a8..00000000000
--- a/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a5be67e2cb2798850ecf2609115d660d85b98bc
diff --git a/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1
new file mode 100644
index 00000000000..4165cf3a518
--- /dev/null
+++ b/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1
@@ -0,0 +1 @@
+527f551a232c39bf78f4862feb4126ce9cdb02c9
diff --git a/solr/test-framework/ivy.xml b/solr/test-framework/ivy.xml
index 1682fc4a443..f9b4b06a5ca 100644
--- a/solr/test-framework/ivy.xml
+++ b/solr/test-framework/ivy.xml
@@ -32,8 +32,8 @@
       <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
 
       <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.6" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.6" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>