@@ -3,6 +3,7 @@ package main

 import (

 	"fmt"

 	"os/exec"

+	"strconv"

 	"strings"

 	"testing"

 	"time"

@@ -55,3 +56,17 @@ func TestCLIGetEventsPause(t *testing.T) {

 	logDone("events - pause/unpause is logged")

 }

+

+func TestCLILimitEvents(t *testing.T) {

+	for i := 0; i < 30; i++ {

+		cmd(t, "run", "busybox", "echo", strconv.Itoa(i))

+	}

+	eventsCmd := exec.Command(dockerBinary, "events", "--since=0", fmt.Sprintf("--until=%d", time.Now().Unix()))

+	out, _, _ := runCommandWithOutput(eventsCmd)

+	events := strings.Split(out, "\n")

+	n_events := len(events) - 1

+	if n_events > 64 {

+		t.Fatalf("events should be limited to 64, but received %d", n_events)

+	}

+	logDone("events - limited to 64 entries")

+}