@@ -21,7 +21,7 @@ public class EndpointSpec implements Serializable {
      * @since 1.24
      */
     @JsonProperty("Mode")
-    EndpointResolutionMode mode;
+    EndpointResolutionMode mode=EndpointResolutionMode.VIP;
 
     /**
      * @since 1.24
 
@@ -50,11 +50,11 @@ public class TaskSpec implements Serializable {
 
     /**
      * @since 1.24
-     *  a counter that triggers an update even if no relevant parameters have been changed
-     *  a random value will work if it is incrementing.
+     * a counter that triggers an update even if no relevant parameters have been changed
+     * a random value will work if it is incrementing.
      */
     @JsonProperty("ForceUpdate")
-    private Integer forceUpdate;
+    private Integer forceUpdate = 0;
 
     /**
      * @see #containerSpec
 
@@ -2,14 +2,18 @@
 
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.EndpointSpec;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.NetworkAttachmentConfig;
+import com.github.dockerjava.api.model.PortConfig;
+import com.github.dockerjava.api.model.PortConfigProtocol;
 import com.github.dockerjava.api.model.Service;
 import com.github.dockerjava.api.model.ServiceModeConfig;
 import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -26,7 +30,7 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
     private static final String SERVICE_NAME = "theservice";
-    
+
     @Test
     public void testCreateService() throws DockerException {
         dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
@@ -62,7 +66,6 @@ public void testCreateServiceWithNetworks() {
                 .withIpam(new Network.Ipam()
                         .withDriver("default"))
                 .exec().getId();
-
         ServiceSpec spec = new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
@@ -74,10 +77,16 @@ public void testCreateServiceWithNetworks() {
                                 .withTarget(networkId)
                                 .withAliases(Lists.<String>newArrayList("alias1", "alias2"))
                 ))
+                .withLabels(ImmutableMap.of("com.docker.java.usage","SwarmServiceIT"))
                 .withMode(new ServiceModeConfig().withReplicated(
                         new ServiceReplicatedModeOptions()
                                 .withReplicas(1)
-                ));
+                )).withEndpointSpec(new EndpointSpec()
+                        .withPorts(Lists.<PortConfig>newArrayList(new PortConfig()
+                                .withPublishMode(PortConfig.PublishMode.host)
+                                .withPublishedPort(22)
+                                .withProtocol(PortConfigProtocol.TCP)
+                        )));
 
         dockerRule.getClient().createServiceCmd(spec).exec();