diff --git a/bunsen-core/pom.xml b/bunsen-core/pom.xml
index b7a5abf9..332ac01c 100644
--- a/bunsen-core/pom.xml
+++ b/bunsen-core/pom.xml
@@ -48,7 +48,7 @@
 
     <dependency>
       <groupId>ca.uhn.hapi.fhir</groupId>
-      <artifactId>hapi-fhir-utilities</artifactId>
+      <artifactId>org.hl7.fhir.utilities</artifactId>
       <scope>compile</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 574cd560..5c4d2092 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <scala.version>2.11.8</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <parquet.version>1.7.0</parquet.version>
-    <hapi.fhir.version>3.6.0</hapi.fhir.version>
+    <hapi.fhir.version>4.0.0</hapi.fhir.version>
     <junit.version>4.11</junit.version>
     <scm.url>http://github.com/cerner/bunsen/tree/master/</scm.url>
     <scm.connection>scm:git:git@github.com/cerner/bunsen.git</scm.connection>
@@ -541,6 +541,13 @@
         <version>${hapi.fhir.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>ca.uhn.hapi.fhir</groupId>
+        <artifactId>org.hl7.fhir.utilities</artifactId>
+        <version>${hapi.fhir.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
       <!-- HAPI FHIR DSTU3 -->
       <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
diff --git a/python/tests/test_bunsen_r4.py b/python/tests/test_bunsen_r4.py
index 1bc33dee..068b868c 100644
--- a/python/tests/test_bunsen_r4.py
+++ b/python/tests/test_bunsen_r4.py
@@ -50,6 +50,7 @@ def spark_session(request):
   spark = SparkSession.builder \
     .appName('bunsen-test') \
     .master('local[2]') \
+    .config('spark.driver.host', 'localhost') \
     .config('spark.jars', shaded_jar) \
     .config('hive.exec.dynamic.partition.mode', 'nonstrict') \
     .config('spark.sql.warehouse.dir', mkdtemp()) \
diff --git a/python/tests/test_bunsen_stu3.py b/python/tests/test_bunsen_stu3.py
index 31a99570..49aa3296 100644
--- a/python/tests/test_bunsen_stu3.py
+++ b/python/tests/test_bunsen_stu3.py
@@ -50,6 +50,7 @@ def spark_session(request):
   spark = SparkSession.builder \
     .appName('bunsen-test') \
     .master('local[2]') \
+    .config('spark.driver.host', 'localhost') \
     .config('spark.jars', shaded_jar) \
     .config('hive.exec.dynamic.partition.mode', 'nonstrict') \
     .config('spark.sql.warehouse.dir', mkdtemp()) \