diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index afe38d245..0151076fd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -70,7 +70,7 @@ public static HostConfig newHostConfig() {
     @JsonProperty("MemorySwappiness")
     private Long memorySwappiness;
 
-    @JsonProperty("NanoCPUs")
+    @JsonProperty("NanoCpus")
     private Long nanoCPUs;
 
     @JsonProperty("CapAdd")
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 227c0acc9..0ae715b5d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -1065,4 +1065,23 @@ public void createContainerWithTmpFs() throws DockerException {
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m"));
     }
+
+    @Test
+    public void createContainerWithNanoCPUs() throws DockerException {
+        Long nanoCPUs = 1000000000L;
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+            .withCmd("sleep", "9999")
+            .withHostConfig(newHostConfig()
+                .withNanoCPUs(nanoCPUs))
+            .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(is(emptyString())));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs));
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 25b9aff18..9e47cfd9f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -138,4 +138,19 @@ public void inspectContainerNetworkSettings() throws DockerException {
 
         assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode());
     }
+
+    @Test
+    public void inspectContainerNanoCPUs() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+            .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(is(emptyString())));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(0L));
+    }
 }