diff --git a/endtoendtests/pom.xml b/endtoendtests/pom.xml
index 0375f2b9..373925ab 100644
--- a/endtoendtests/pom.xml
+++ b/endtoendtests/pom.xml
@@ -35,7 +35,7 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-		</repository>		
+		</repository>
 	</repositories>
 
 	<pluginRepositories>
@@ -67,6 +67,11 @@
 			<groupId>com.microsoft.azure.functions</groupId>
 			<artifactId>azure-functions-java-library</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.microsoft.azure</groupId>
+			<artifactId>azure-eventhubs</artifactId>
+			<version>2.2.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/endtoendtests/src/main/java/com/microsoft/azure/functions/endtoend/EventHubTriggerTests.java b/endtoendtests/src/main/java/com/microsoft/azure/functions/endtoend/EventHubTriggerTests.java
index a2e9efdb..ce82f874 100644
--- a/endtoendtests/src/main/java/com/microsoft/azure/functions/endtoend/EventHubTriggerTests.java
+++ b/endtoendtests/src/main/java/com/microsoft/azure/functions/endtoend/EventHubTriggerTests.java
@@ -1,6 +1,7 @@
 package com.microsoft.azure.functions.endtoend;
 
 import com.microsoft.azure.functions.annotation.*;
+import com.microsoft.azure.eventhubs.EventData;
 import com.microsoft.azure.functions.*;
 import java.util.*;
 
@@ -23,15 +24,14 @@ public void EventHubTriggerAndOutputJSON(
 
     @FunctionName("EventHubTriggerAndOutputString")
     public void EventHubTriggerAndOutputString(
-        @EventHubTrigger(name = "messages", eventHubName = "test-input-java", connection = "AzureWebJobsEventHubSender", dataType = "string", cardinality = Cardinality.MANY) String[] messages,
+        @EventHubTrigger(name = "messages", eventHubName = "test-input-java", connection = "AzureWebJobsEventHubSender", dataType = "string", cardinality = Cardinality.MANY) EventData[] messages,
         @BindingName("SystemPropertiesArray") SystemProperty[] systemPropertiesArray,
         @EventHubOutput(name = "output", eventHubName = "test-output-java", connection = "AzureWebJobsEventHubSender") OutputBinding<String> output,
         final ExecutionContext context
     ) {
         context.getLogger().info("Java Event Hub trigger received " + messages.length +" messages");
         context.getLogger().info("SystemProperties for message[0]: EnqueuedTimeUtc=" + systemPropertiesArray[0].EnqueuedTimeUtc +" Offset=" +systemPropertiesArray[0].Offset);
-        output.setValue(messages[0]);
-        
+        context.getLogger().info("SystemProperties from EventData message[0]: EnqueuedTimeUtc=" + messages[0].getSystemProperties().getEnqueuedTime() +" Offset=" +systemPropertiesArray[0].Offset);
     }
 
     @FunctionName("EventHubTriggerCardinalityOne")