diff --git a/client/driver/docker.go b/client/driver/docker.go
index 9bc8554ba53..4dc6ae08f62 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -1609,6 +1609,13 @@ func (h *DockerHandle) run() {
 		werr = fmt.Errorf("Docker container exited with non-zero exit code: %d", exitCode)
 	}
 
+	container, ierr := h.waitClient.InspectContainer(h.containerID)
+	if ierr != nil {
+		h.logger.Printf("[ERR] driver.docker: failed to inspect container %s: %v", h.containerID, ierr)
+	} else if container.State.OOMKilled {
+		werr = fmt.Errorf("OOM Killed")
+	}
+
 	close(h.doneCh)
 
 	// Shutdown the syslog collector
diff --git a/client/driver/docker_test.go b/client/driver/docker_test.go
index 1f2e63223dc..962c0efdf35 100644
--- a/client/driver/docker_test.go
+++ b/client/driver/docker_test.go
@@ -1753,3 +1753,53 @@ func TestDockerDriver_AuthConfiguration(t *testing.T) {
 		}
 	}
 }
+
+func TestDockerDriver_OOMKilled(t *testing.T) {
+	if !tu.IsTravis() {
+		t.Parallel()
+	}
+	if !testutil.DockerIsConnected(t) {
+		t.Skip("Docker not connected")
+	}
+
+	task := &structs.Task{
+		Name:   "oom-killed",
+		Driver: "docker",
+		Config: map[string]interface{}{
+			"image":   "busybox",
+			"load":    "busybox.tar",
+			"command": "sh",
+			// Incrementally creates a bigger and bigger variable.
+			"args": []string{"-c", "x=a; while true; do eval x='$x$x'; done"},
+		},
+		LogConfig: &structs.LogConfig{
+			MaxFiles:      10,
+			MaxFileSizeMB: 10,
+		},
+		Resources: &structs.Resources{
+			CPU:      250,
+			MemoryMB: 10,
+			DiskMB:   20,
+			Networks: []*structs.NetworkResource{},
+		},
+	}
+
+	_, handle, cleanup := dockerSetup(t, task)
+	defer cleanup()
+
+	select {
+	case res := <-handle.WaitCh():
+		if res.Successful() {
+			t.Fatalf("expected error, but container exited successfull")
+		}
+
+		if res.Err.Error() != "OOM Killed" {
+			t.Fatalf("not killed by OOM killer: %s", res.Err)
+		}
+
+		t.Logf("Successfully killed by OOM killer")
+
+	case <-time.After(time.Duration(tu.TestMultiplier()*5) * time.Second):
+		t.Fatalf("timeout")
+	}
+}