diff --git a/build.sbt b/build.sbt
index e466d5e..8a3945d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,7 +5,7 @@ licenses in ThisBuild += ("Apache-2.0", url("http://www.apache.org/licenses/LICE
 
 scalaVersion in ThisBuild := "2.11.7"
 
-crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.7")
+crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.7", "2.12.1")
 
 shellPrompt in ThisBuild := CustomShellPrompt.customPrompt
 
diff --git a/integration/src/it/scala/dynamodb/GlobalSecondaryIndexSpec.scala b/integration/src/it/scala/dynamodb/GlobalSecondaryIndexSpec.scala
index 17a6bbf..ad06f29 100644
--- a/integration/src/it/scala/dynamodb/GlobalSecondaryIndexSpec.scala
+++ b/integration/src/it/scala/dynamodb/GlobalSecondaryIndexSpec.scala
@@ -16,14 +16,12 @@
 
 package com.github.dwhjames.awswrap.dynamodb
 
+import org.scalatest.{FlatSpec, Matchers}
+
 import scala.collection.JavaConverters._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 
-import org.scalatest.{ FlatSpec, BeforeAndAfterAll, Matchers }
-
-import com.amazonaws.AmazonClientException
-
 
 class QueryGlobalSecondaryIndexSpec
   extends FlatSpec
diff --git a/integration/src/it/scala/dynamodb/ReadsOnHashKeyTablesSpec.scala b/integration/src/it/scala/dynamodb/ReadsOnHashKeyTablesSpec.scala
index 64c9312..3ac5f92 100644
--- a/integration/src/it/scala/dynamodb/ReadsOnHashKeyTablesSpec.scala
+++ b/integration/src/it/scala/dynamodb/ReadsOnHashKeyTablesSpec.scala
@@ -17,14 +17,12 @@
 
 package com.github.dwhjames.awswrap.dynamodb
 
+import org.scalatest.{FlatSpec, Matchers}
+
 import scala.collection.JavaConverters._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 
-import org.scalatest.{ FlatSpec, BeforeAndAfterAll, Matchers }
-
-import com.amazonaws.AmazonClientException
-
 
 class ReadsOnHashKeyTableSpec
   extends FlatSpec
diff --git a/integration/src/it/scala/s3/FutureTransferSpec.scala b/integration/src/it/scala/s3/FutureTransferSpec.scala
index ad4a136..2111f90 100644
--- a/integration/src/it/scala/s3/FutureTransferSpec.scala
+++ b/integration/src/it/scala/s3/FutureTransferSpec.scala
@@ -17,14 +17,10 @@
 package com.github.dwhjames.awswrap
 package s3
 
-import scala.concurrent.ExecutionContext.Implicits.global
-
 import java.io.File
 
 import org.scalatest.{ FlatSpec, Matchers }
 
-import com.amazonaws.AmazonClientException
-
 
 class FutureTransferSpec
   extends FlatSpec
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 25281de..d27c803 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -34,6 +34,6 @@ object Dependencies {
 
   object IntegrationTest {
 
-    val scalaTest = "org.scalatest" %% "scalatest" % "2.2.4" % "it"
+    val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1" % "it"
   }
 }
diff --git a/src/main/scala/dynamodb/SingleThreadedBatchWriter.scala b/src/main/scala/dynamodb/SingleThreadedBatchWriter.scala
index 41926c4..83c3254 100644
--- a/src/main/scala/dynamodb/SingleThreadedBatchWriter.scala
+++ b/src/main/scala/dynamodb/SingleThreadedBatchWriter.scala
@@ -20,8 +20,8 @@ package com.github.dwhjames.awswrap.dynamodb
 import java.{util => ju}
 import java.util.Random
 
-import com.amazonaws.{AmazonClientException, AmazonServiceException, ClientConfiguration}
-import com.amazonaws.auth.{AWSCredentials, AWSCredentialsProvider, BasicAWSCredentials}
+import com.amazonaws.{AmazonServiceException, ClientConfiguration}
+import com.amazonaws.auth.{AWSCredentials, AWSCredentialsProvider}
 import com.amazonaws.internal.StaticCredentialsProvider
 import com.amazonaws.retry.RetryUtils
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient
diff --git a/src/main/scala/s3/s3.scala b/src/main/scala/s3/s3.scala
index 7844316..0c69a69 100644
--- a/src/main/scala/s3/s3.scala
+++ b/src/main/scala/s3/s3.scala
@@ -22,13 +22,13 @@ import java.io.{InputStream, File}
 import java.net.URL
 
 import scala.collection.JavaConverters._
-import scala.concurrent.{ExecutionContext, Future, Promise}
+import scala.concurrent.{Future, Promise}
 import scala.util.Try
 
 import java.util.concurrent.{Executors, ExecutorService, ThreadFactory}
 import java.util.concurrent.atomic.AtomicLong
 
-import com.amazonaws.{AmazonWebServiceRequest, ClientConfiguration}
+import com.amazonaws.ClientConfiguration
 import com.amazonaws.auth.{AWSCredentials, AWSCredentialsProvider, DefaultAWSCredentialsProviderChain}
 import com.amazonaws.event.{ProgressListener, ProgressEvent, ProgressEventType}
 import com.amazonaws.internal.StaticCredentialsProvider;