diff --git a/README.md b/README.md
index 87b0cbc..65fdbdf 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ The `RequestTrackerConfiguration` sets the HTTP header name to `X-Request-Tracke
 By default `UuidSupplier` is used by the bundle and filters.  The provided bundle and filters provide constructors for you to pass in your own custom ID supplier.  Your custom ID supplier must implement Guava's `Supplier<String>`.  Here's an example ID supplier:
 
 ```java
-import com.google.common.base.Supplier;
+import java.util.function.Supplier;
 
 public class CustomIdSupplier implements Supplier<String> {
 	@Override
diff --git a/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/BundleApplicationIT.java b/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/BundleApplicationIT.java
index 367fc8d..a2edd14 100644
--- a/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/BundleApplicationIT.java
+++ b/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/BundleApplicationIT.java
@@ -19,7 +19,7 @@
 
 
 public class BundleApplicationIT {
-	private static final DropwizardAppRule<BundleConfiguration> DROPWIZARD_APP_RULE = new DropwizardAppRule<BundleConfiguration>(BundleApplication.class);
+	private static final DropwizardAppRule<BundleConfiguration> DROPWIZARD_APP_RULE = new DropwizardAppRule<>(BundleApplication.class);
 	private static final IntegrationTestSetupRule INTEGRATION_TEST_SETUP_RULE = new IntegrationTestSetupRule(DROPWIZARD_APP_RULE);
 
 	@ClassRule
diff --git a/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplier.java b/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplier.java
index 1679805..f776278 100644
--- a/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplier.java
+++ b/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplier.java
@@ -1,6 +1,6 @@
 package com.serviceenabled.dropwizardrequesttracker.it;
 
-import com.google.common.base.Supplier;
+import java.util.function.Supplier;
 
 public class CustomIdSupplier implements Supplier<String> {
 	@Override
diff --git a/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplierBundleApplicationIT.java b/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplierBundleApplicationIT.java
index 0074897..1c01edd 100644
--- a/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplierBundleApplicationIT.java
+++ b/src/test/java/com/serviceenabled/dropwizardrequesttracker/it/CustomIdSupplierBundleApplicationIT.java
@@ -15,7 +15,7 @@
 
 
 public class CustomIdSupplierBundleApplicationIT {
-	private static final DropwizardAppRule<BundleConfiguration> DROPWIZARD_APP_RULE = new DropwizardAppRule<BundleConfiguration>(CustomIdSupplierBundleApplication.class);
+	private static final DropwizardAppRule<BundleConfiguration> DROPWIZARD_APP_RULE = new DropwizardAppRule<>(CustomIdSupplierBundleApplication.class);
 	private static final IntegrationTestSetupRule INTEGRATION_TEST_SETUP_RULE = new IntegrationTestSetupRule(DROPWIZARD_APP_RULE);
 
 	@ClassRule