diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
index b1cd65a7102..12a95ca0c5e 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
@@ -84,9 +84,11 @@ class BasicJavaGenerator extends BasicGenerator {
   override def importMapping = Map(
     "File" -> "java.io.File",
     "Date" -> "java.util.Date",
+    "Timestamp" -> "java.sql.Timestamp",
     "Array" -> "java.util.*",
     "ArrayList" -> "java.util.*",
     "List" -> "java.util.*",
+    "Set" -> "java.util.*",
     "DateTime" -> "org.joda.time.*",
     "LocalDateTime" -> "org.joda.time.*",
     "LocalDate" -> "org.joda.time.*",
diff --git a/src/test/scala/BasicJavaGeneratorTest.scala b/src/test/scala/BasicJavaGeneratorTest.scala
index b9d54bd03d9..6b0afd79705 100644
--- a/src/test/scala/BasicJavaGeneratorTest.scala
+++ b/src/test/scala/BasicJavaGeneratorTest.scala
@@ -123,6 +123,8 @@ class BasicJavaGeneratorTest extends FlatSpec with ShouldMatchers {
   it should "honor the import mapping" in {
   	config.importMapping("Date") should be ("java.util.Date")
   	config.importMapping("DateTime") should be ("org.joda.time.*")
+  	config.importMapping("Timestamp") should be ("java.sql.Timestamp")
+  	config.importMapping("Set") should be ("java.util.*")
   }
 
   /*