diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go
index 34d7db0d5a..e27b3ab4ee 100644
--- a/integration-cli/docker_cli_events_test.go
+++ b/integration-cli/docker_cli_events_test.go
@@ -70,3 +70,70 @@ func TestCLILimitEvents(t *testing.T) {
 	}
 	logDone("events - limited to 64 entries")
 }
+
+func TestCLIGetEventsContainerEvents(t *testing.T) {
+	cmd(t, "run", "--rm", "busybox", "true")
+	eventsCmd := exec.Command(dockerBinary, "events", "--since=0", fmt.Sprintf("--until=%d", time.Now().Unix()))
+	out, exitCode, err := runCommandWithOutput(eventsCmd)
+	if exitCode != 0 || err != nil {
+		t.Fatal("Failed to get events with exit code %d: %s", exitCode, err)
+	}
+	events := strings.Split(out, "\n")
+	events = events[:len(events)-1]
+	if len(events) < 4 {
+		t.Fatalf("Missing expected event")
+	}
+	createEvent := strings.Fields(events[len(events)-4])
+	startEvent := strings.Fields(events[len(events)-3])
+	dieEvent := strings.Fields(events[len(events)-2])
+	destroyEvent := strings.Fields(events[len(events)-1])
+	if createEvent[len(createEvent)-1] != "create" {
+		t.Fatalf("event should be create, not %#v", createEvent)
+	}
+	if startEvent[len(startEvent)-1] != "start" {
+		t.Fatalf("event should be pause, not %#v", startEvent)
+	}
+	if dieEvent[len(dieEvent)-1] != "die" {
+		t.Fatalf("event should be pause, not %#v", dieEvent)
+	}
+	if destroyEvent[len(destroyEvent)-1] != "destroy" {
+		t.Fatalf("event should be pause, not %#v", destroyEvent)
+	}
+
+	logDone("events - container create, start, die, destroy is logged")
+}
+
+func TestCLIGetEventsImageUntagDelete(t *testing.T) {
+	name := "testimageevents"
+	defer deleteImages(name)
+	_, err := buildImage(name,
+		`FROM scratch
+		MAINTAINER "docker"`,
+		true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := deleteImages(name); err != nil {
+		t.Fatal(err)
+	}
+	eventsCmd := exec.Command(dockerBinary, "events", "--since=0", fmt.Sprintf("--until=%d", time.Now().Unix()))
+	out, exitCode, err := runCommandWithOutput(eventsCmd)
+	if exitCode != 0 || err != nil {
+		t.Fatal("Failed to get events with exit code %d: %s", exitCode, err)
+	}
+	events := strings.Split(out, "\n")
+	t.Log(events)
+	events = events[:len(events)-1]
+	if len(events) < 2 {
+		t.Fatalf("Missing expected event")
+	}
+	untagEvent := strings.Fields(events[len(events)-2])
+	deleteEvent := strings.Fields(events[len(events)-1])
+	if untagEvent[len(untagEvent)-1] != "untag" {
+		t.Fatalf("untag should be untag, not %#v", untagEvent)
+	}
+	if deleteEvent[len(deleteEvent)-1] != "delete" {
+		t.Fatalf("delete should be delete, not %#v", deleteEvent)
+	}
+	logDone("events - image untag, delete is logged")
+}