diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
index e990bb14c54..2a815291768 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
@@ -4,6 +4,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.*;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteTouchScreen;
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
index b7273b83191..d81b4c06f9c 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
@@ -4,6 +4,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.*;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteTouchScreen;
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
index e93506ca154..cc8f9c59563 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
@@ -4,6 +4,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.*;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteTouchScreen;
 import org.openqa.selenium.remote.RemoteWebDriver;
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
index 98922a87190..803e3f8ce6d 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
@@ -20,9 +20,9 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.Point;
-import org.openqa.selenium.HasTouchScreen;
+import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.TouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
index 1421fe99a2c..37e398c71eb 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
@@ -15,6 +15,8 @@
 import org.junit.Test;
 import org.openqa.selenium.*;
 import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.touch.TouchActions;
 import org.openqa.selenium.remote.*;
 
diff --git a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidContactsTest.java b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
index d72f08bbb83..58192e6787b 100644
--- a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
+++ b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
@@ -1,6 +1,8 @@
 package com.saucelabs.appium;
 
 import org.openqa.selenium.*;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteTouchScreen;
diff --git a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidTest.java b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidTest.java
index 1b4ff2efcc4..9770cca363a 100644
--- a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidTest.java
+++ b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidTest.java
@@ -2,6 +2,8 @@
 
 import junit.framework.Assert;
 import org.openqa.selenium.*;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteTouchScreen;
diff --git a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
index 1750ce5c4b7..4a05e5a7b7f 100644
--- a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
+++ b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
@@ -1,6 +1,8 @@
 package com.saucelabs.appium;
 
 import org.openqa.selenium.*;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteTouchScreen;
 import org.openqa.selenium.remote.RemoteWebDriver;
diff --git a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/SimpleTest.java b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/SimpleTest.java
index c361033774c..535dc9d6713 100644
--- a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/SimpleTest.java
+++ b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/SimpleTest.java
@@ -3,36 +3,35 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
-
 import org.apache.http.util.EntityUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
-
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.Point;
-import org.openqa.selenium.HasTouchScreen;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.TouchScreen;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.RemoteTouchScreen;
 import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.touch.TouchActions;
 
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
 
diff --git a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/UICatalogTest.java b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/UICatalogTest.java
index 7e92168d29c..a171eddaf0b 100644
--- a/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/UICatalogTest.java
+++ b/sample-code/examples/java/testng/src/test/java/com/saucelabs/appium/UICatalogTest.java
@@ -11,6 +11,8 @@
 import org.json.simple.parser.JSONParser;
 import org.openqa.selenium.*;
 import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.interactions.HasTouchScreen;
+import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.touch.TouchActions;
 import org.openqa.selenium.remote.*;
 import org.testng.annotations.AfterMethod;