diff --git a/src/main/scala/uk/org/floop/sparqlTestRunner/SparqlTestRunner.scala b/src/main/scala/uk/org/floop/sparqlTestRunner/SparqlTestRunner.scala
index 354f3a8..731f6c8 100644
--- a/src/main/scala/uk/org/floop/sparqlTestRunner/SparqlTestRunner.scala
+++ b/src/main/scala/uk/org/floop/sparqlTestRunner/SparqlTestRunner.scala
@@ -25,7 +25,7 @@
 import org.apache.http.impl.client.{BasicAuthCache, BasicCredentialsProvider, HttpClients}
 import org.apache.http.message.BasicHeader
 import org.apache.jena.query._
-import org.apache.jena.riot.RDFDataMgr
+import org.apache.jena.riot.{RDFDataMgr, RDFFormat}
 import org.apache.jena.riot.system.RiotLib
 import org.apache.jena.sparql.engine.http.{QueryEngineHTTP, QueryExceptionHTTP}
 import org.apache.jena.sparql.mgt.Explain
@@ -39,6 +39,7 @@
 import scala.io.Source
 import scala.util.Using
 import scala.xml.{NodeSeq, PCData, XML}
+import scala.jdk.CollectionConverters._
 
 case class Config(dirs: List[File] = List.empty,
                   report: File = new File("reports/TESTS-sparql-test-runner.xml"),
@@ -168,8 +169,10 @@
               val dataset = DatasetFactory.create
               for (d <- config.data) {
                 logger.debug(s"Loading $d")
-                RDFDataMgr.read(dataset, d.toString)
+                val model = RDFDataMgr.loadModel(d.toString)
+                dataset.addNamedModel(d.toURI.toString, model)
               }
+              dataset.setDefaultModel(dataset.getUnionModel)
               (query: Query) => QueryExecutionFactory.create(query, dataset)
           }
           // Add query timeout, FROMs, etc.