diff --git a/integrationtests/self/close_test.go b/integrationtests/self/close_test.go
new file mode 100644
index 00000000000..a3126d2082a
--- /dev/null
+++ b/integrationtests/self/close_test.go
@@ -0,0 +1,84 @@
+package self_test
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"time"
+
+	"github.com/lucas-clemente/quic-go/internal/protocol"
+
+	"github.com/lucas-clemente/quic-go"
+
+	quicproxy "github.com/lucas-clemente/quic-go/integrationtests/tools/proxy"
+	"github.com/lucas-clemente/quic-go/internal/utils"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Connection ID lengths tests", func() {
+	for _, v := range protocol.SupportedVersions {
+		version := v
+
+		Context(fmt.Sprintf("with QUIC version %s", version), func() {
+
+			It("retransmits the CONNECTION_CLOSE packet", func() {
+				server, err := quic.ListenAddr(
+					"localhost:0",
+					getTLSConfig(),
+					getQuicConfig(&quic.Config{
+						DisablePathMTUDiscovery: true,
+					}),
+				)
+				Expect(err).ToNot(HaveOccurred())
+
+				var drop utils.AtomicBool
+				var dropped [][]byte
+				proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
+					RemoteAddr: fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
+					DelayPacket: func(dir quicproxy.Direction, _ []byte) time.Duration {
+						return 5 * time.Millisecond // 10ms RTT
+					},
+					DropPacket: func(dir quicproxy.Direction, b []byte) bool {
+						if drop := drop.Get(); drop && dir == quicproxy.DirectionOutgoing {
+							dropped = append(dropped, b)
+							return true
+						}
+						return false
+					},
+				})
+				Expect(err).ToNot(HaveOccurred())
+				defer proxy.Close()
+
+				conn, err := quic.DialAddr(
+					fmt.Sprintf("localhost:%d", proxy.LocalPort()),
+					getTLSClientConfig(),
+					getQuicConfig(&quic.Config{Versions: []protocol.VersionNumber{version}}),
+				)
+				Expect(err).ToNot(HaveOccurred())
+
+				sconn, err := server.Accept(context.Background())
+				Expect(err).ToNot(HaveOccurred())
+				time.Sleep(100 * time.Millisecond)
+				drop.Set(true)
+				sconn.CloseWithError(1337, "closing")
+
+				// send 100 packets
+				for i := 0; i < 100; i++ {
+					str, err := conn.OpenStream()
+					Expect(err).ToNot(HaveOccurred())
+					_, err = str.Write([]byte("foobar"))
+					Expect(err).ToNot(HaveOccurred())
+					time.Sleep(time.Millisecond)
+				}
+				// Expect retransmissions of the CONNECTION_CLOSE for the
+				// 1st, 2nd, 4th, 8th, 16th, 32th, 64th packet: 7 in total (+1 for the original packet)
+				Eventually(dropped).Should(HaveLen(8))
+				for _, p := range dropped {
+					Expect(p).To(Equal(dropped[0])) // these packets are all identical
+				}
+			})
+		})
+	}
+})