diff --git a/akka-actor/src/main/java/akka/japi/JAPI.java b/akka-actor/src/main/java/akka/japi/JAPI.java
index 4c040220f3..886a0ea3d7 100644
--- a/akka-actor/src/main/java/akka/japi/JAPI.java
+++ b/akka-actor/src/main/java/akka/japi/JAPI.java
@@ -4,6 +4,7 @@ import scala.collection.Seq;
 
 public class JAPI {
 
+  @SafeVarargs
   public static <T> Seq<T> seq(T... ts) {
     return Util.immutableSeq(ts);
   }
diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/FormData.java b/akka-http-core/src/main/java/akka/http/javadsl/model/FormData.java
index 46c0b22843..1564d8097f 100644
--- a/akka-http-core/src/main/java/akka/http/javadsl/model/FormData.java
+++ b/akka-http-core/src/main/java/akka/http/javadsl/model/FormData.java
@@ -40,6 +40,7 @@ public final class FormData {
   /**
    * Creates the FormData from the given parameters.
    */
+  @SafeVarargs
   public static FormData create(Pair<String, String>... params) {
     return new FormData(Query.create(params));
   }
diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java b/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java
index 6a1472de98..74e3d1141f 100644
--- a/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java
+++ b/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java
@@ -94,6 +94,7 @@ public abstract class Query {
     /**
      * Returns a Query from the given parameters.
      */
+    @SafeVarargs
     public static Query create(Pair<String, String>... params) {
         return new JavaQuery(UriJavaAccessor.queryApply(params));
     }
diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java
index 886a9889ff..93c4ed27d9 100644
--- a/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java
+++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java
@@ -34,16 +34,17 @@ public class FormFieldsTest extends JUnitRouteTest {
     static RequestVal<Option<Integer>> optionalIntParam = FormFields.intValue("optionalIntParam").optional();
 
     private Map.Entry<String, String> entry(String name, String value) {
-        return new AbstractMap.SimpleImmutableEntry<String, String>(name, value);
+        return new AbstractMap.SimpleImmutableEntry<>(name, value);
     }
-    private HttpRequest urlEncodedRequest(Map.Entry<String, String>... entries) {
+    @SafeVarargs
+    final private HttpRequest urlEncodedRequest(Map.Entry<String, String>... entries) {
         StringBuilder sb = new StringBuilder();
         boolean next = false;
         for (Map.Entry<String, String> entry: entries) {
             if (next) {
                 sb.append('&');
-                next = true;
             }
+            next = true;
             sb.append(entry.getKey());
             sb.append('=');
             sb.append(entry.getValue());