diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index bc83109b3c4..f94ece483df 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -79,7 +79,7 @@ com.sun.jersey.version = 1.9
 /mecab/mecab-ipadic = 2.7.0-20070801
 /mecab/mecab-naist-jdic = 0.6.3b-20111013
 /net.arnx/jsonic = 1.2.7
-/net.sf.saxon/Saxon-HE = 9.5.1-4
+/net.sf.saxon/Saxon-HE = 9.6.0-2
 /net.sourceforge.argparse4j/argparse4j = 0.4.3
 /net.sourceforge.jmatio/jmatio = 1.0
 /net.sourceforge.nekohtml/nekohtml = 1.9.17
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b5402592b50..f8e5b0ab275 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -443,6 +443,8 @@ Other Changes
 
 * SOLR-4792: Stop shipping a .war. (Robert Muir, Ramkumar Aiyengar, Mark Miller)
 
+* SOLR-6799: Update Saxon-HE to 9.6.0-2. (Mark Miller)
+
 ==================  4.10.3 ==================
 
 Bug Fixes
diff --git a/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java b/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
index 8b8ec76767b..984d88d3e49 100644
--- a/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
+++ b/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
@@ -43,8 +43,6 @@ public class SolrCellMorphlineTest extends AbstractSolrMorphlineTestBase {
   @BeforeClass
   public static void beforeClass2() {
     assumeFalse("FIXME: Morphlines currently has issues with Windows paths", Constants.WINDOWS);
-    assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
-    assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
   }
 
   @Before
diff --git a/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1 b/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
new file mode 100644
index 00000000000..56981f2d3bf
--- /dev/null
+++ b/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
@@ -0,0 +1 @@
+826a6c32fef050346b37e91b36fde16cf932da12