diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 40d1c2eebe5..f344b82bf98 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -298,6 +298,8 @@ Improvements
 
 Other:
 
+* LUCENE-8485: Update randomizedtesting to version 2.6.4. (Dawid Weiss)
+
 * LUCENE-8366: Upgrade to ICU 62.1. Emoji handling now uses Unicode 11's
   Extended_Pictographic property. (Robert Muir)
 
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index ac4c504d69b..68e17da2eab 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1148,7 +1148,6 @@
             <sysproperty key="java.io.tmpdir" value="./temp" />
 
             <!-- Restrict access to certain Java features and install security manager: -->
-            <sysproperty key="junit4.tempDir" file="@{workDir}/temp" />
             <sysproperty key="common.dir" file="${common.dir}" />
             <sysproperty key="clover.db.dir" file="${clover.db.dir}" />
             <syspropertyset>
@@ -2643,7 +2642,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="-Dversion=${version},-Dtest.seed=${pitest.seed},-Djava.security.manager=org.apache.lucene.util.TestSecurityManager,-Djava.security.policy=${tests.policy},-Djava.io.tmpdir=${tests.workDir},-Djunit4.childvm.cwd=${tests.workDir},-Djunit4.tempDir=${tests.workDir}" />
+        <property name="pitest.sysprops" value="-Dversion=${version},-Dtest.seed=${pitest.seed},-Djava.security.manager=org.apache.lucene.util.TestSecurityManager,-Djava.security.policy=${tests.policy},-Djava.io.tmpdir=${tests.workDir},-Djunit4.childvm.cwd=${tests.workDir}" />
 
         <pitest
             classPath="pitest.classpath"
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 5ba50c1e157..f53544e12b9 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -5,7 +5,7 @@
 /antlr/antlr = 2.7.7
 /com.adobe.xmp/xmpcore = 5.1.3
 
-com.carrotsearch.randomizedtesting.version = 2.6.0
+com.carrotsearch.randomizedtesting.version = 2.6.4
 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
 /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}
 
diff --git a/lucene/licenses/randomizedtesting-runner-2.6.0.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.6.0.jar.sha1
deleted file mode 100644
index c7baccb21c3..00000000000
--- a/lucene/licenses/randomizedtesting-runner-2.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3787b306dc666f6fa181b1900fb6b941e2b38790
diff --git a/lucene/licenses/randomizedtesting-runner-2.6.4.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.6.4.jar.sha1
new file mode 100644
index 00000000000..83634d903d6
--- /dev/null
+++ b/lucene/licenses/randomizedtesting-runner-2.6.4.jar.sha1
@@ -0,0 +1 @@
+37bc4cf1f458d4718892d33ab77378e38d4877d8
diff --git a/solr/licenses/junit4-ant-2.6.0.jar.sha1 b/solr/licenses/junit4-ant-2.6.0.jar.sha1
deleted file mode 100644
index 9902b347137..00000000000
--- a/solr/licenses/junit4-ant-2.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7512f4c5fb6dc9106a712c390c39e87708148456
diff --git a/solr/licenses/junit4-ant-2.6.4.jar.sha1 b/solr/licenses/junit4-ant-2.6.4.jar.sha1
new file mode 100644
index 00000000000..203d88872a0
--- /dev/null
+++ b/solr/licenses/junit4-ant-2.6.4.jar.sha1
@@ -0,0 +1 @@
+b0a50c6dce5060f8f9040e072b77f7cd85242b3c
diff --git a/solr/licenses/randomizedtesting-runner-2.6.0.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.6.0.jar.sha1
deleted file mode 100644
index c7baccb21c3..00000000000
--- a/solr/licenses/randomizedtesting-runner-2.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3787b306dc666f6fa181b1900fb6b941e2b38790
diff --git a/solr/licenses/randomizedtesting-runner-2.6.4.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.6.4.jar.sha1
new file mode 100644
index 00000000000..83634d903d6
--- /dev/null
+++ b/solr/licenses/randomizedtesting-runner-2.6.4.jar.sha1
@@ -0,0 +1 @@
+37bc4cf1f458d4718892d33ab77378e38d4877d8