diff --git a/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java b/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
index a3198df..1016602 100644
--- a/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
+++ b/api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
@@ -211,4 +211,4 @@ public void started_shouldWipeExistingEntries() {
     Assert.assertTrue(entryNames.contains("Auburndale"));
     Assert.assertTrue(entryNames.contains("Chestnut Hill"));
   }
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 56493b9..5a165b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,9 +75,22 @@
 				<type>pom</type>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>com.thoughtworks.xstream</groupId>
+				<artifactId>xstream</artifactId>
+				<version>1.4.17</version>
+				<scope>provided</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+		</dependency>
+	</dependencies>
+
 	<properties>
 		<openMRSVersion>1.10.6</openMRSVersion>
 		<openMRSMinorVersion>1.9</openMRSMinorVersion>
@@ -93,8 +106,8 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<target>1.6</target>
-						<source>1.6</source>
+						<target>1.7</target>
+						<source>1.7</source>
 						<encoding>UTF-8</encoding>
 					</configuration>
 				</plugin>
@@ -188,6 +201,27 @@
 				<openMRSMinorVersion>1.10</openMRSMinorVersion>
 			</properties>
 		</profile>
+
+		<profile>
+			<id>Java 17</id>
+			<activation>
+				<jdk>17</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>3.2.2</version>
+						<configuration>
+							<argLine>--add-opens java.base/java.lang=ALL-UNNAMED
+								--add-opens java.base/java.util=ALL-UNNAMED
+							</argLine>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 
 </project>