diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 1454a5f80..0181d86be 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -179,6 +179,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getPidMode();
 
+    @CheckForNull
+    String getCgroupParent();
+
     @CheckForNull
     Boolean isTty();
 
@@ -402,6 +405,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withWorkingDir(String workingDir);
 
+    CreateContainerCmd withCgroupParent(String cgroupParent);
+
     /**
      * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index e03acbf7f..bb9fcc318 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -408,9 +410,8 @@ public String getPidMode() {
     }
 
     @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
-                .append(this).toString();
+    public String getCgroupParent() {
+        return hostConfig.getCgroupParent();
     }
 
     @Override
@@ -871,6 +872,13 @@ public CreateContainerCmd withWorkingDir(String workingDir) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCgroupParent(final String cgroupParent) {
+        checkNotNull(cgroupParent, "cgroupParent was not specified");
+        this.hostConfig.withCgroupParent(cgroupParent);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withPidMode(String pidMode) {
         checkNotNull(pidMode, "pidMode was not specified");
@@ -878,4 +886,18 @@ public CreateContainerCmd withPidMode(String pidMode) {
         return this;
     }
 
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 7800a8c12..f2fd32b6a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -69,7 +69,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
+    @Test(expectedExceptions = ConflictException.class)
     public void createContainerWithExistingName() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
@@ -81,11 +81,7 @@ public void createContainerWithExistingName() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        try {
-            dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env").withName(containerName).exec();
-            fail("expected ConflictException");
-        } catch (ConflictException e) {
-        }
+        dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env").withName(containerName).exec();
     }
 
     @Test
@@ -617,4 +613,18 @@ public void onNext(Frame item) {
             super.onNext(item);
         }
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithCgroupParent() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCgroupParent("/parent").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainer = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index e11ff6839..47ed11201 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -63,14 +63,9 @@ public void inspectContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
-
-        try {
-            dockerClient.inspectContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        dockerClient.inspectContainerCmd("non-existing").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 9a6d4b354..02c5cc54e 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -67,7 +67,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
+    @Test(expectedExceptions = ConflictException.class)
     public void createContainerWithExistingName() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
@@ -79,11 +79,7 @@ public void createContainerWithExistingName() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        try {
-            dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
-            fail("expected ConflictException");
-        } catch (ConflictException e) {
-        }
+        dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
     }
 
     @Test
@@ -554,4 +550,18 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithCgroupParent() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCgroupParent("/parent").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainer = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index a07e23143..87fe3b48b 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -63,14 +63,9 @@ public void inspectContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
-
-        try {
-            dockerClient.inspectContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        dockerClient.inspectContainerCmd("non-existing").exec();
     }
 
     @Test