diff --git a/integrationtests/self/datagram_test.go b/integrationtests/self/datagram_test.go
new file mode 100644
index 00000000..371f4c65
--- /dev/null
+++ b/integrationtests/self/datagram_test.go
@@ -0,0 +1,141 @@
+package self_test
+
+import (
+	"context"
+	"encoding/binary"
+	"fmt"
+	mrand "math/rand"
+	"net"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/lucas-clemente/quic-go"
+	quicproxy "github.com/lucas-clemente/quic-go/integrationtests/tools/proxy"
+	"github.com/lucas-clemente/quic-go/internal/protocol"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Datagram test", func() {
+	for _, v := range protocol.SupportedVersions {
+		version := v
+
+		Context(fmt.Sprintf("with QUIC version %s", version), func() {
+			const num = 100
+
+			var (
+				proxy                  *quicproxy.QuicProxy
+				serverConn, clientConn *net.UDPConn
+				dropped, total         int32
+			)
+
+			startServerAndProxy := func() {
+				addr, err := net.ResolveUDPAddr("udp", "localhost:0")
+				Expect(err).ToNot(HaveOccurred())
+				serverConn, err = net.ListenUDP("udp", addr)
+				Expect(err).ToNot(HaveOccurred())
+				ln, err := quic.Listen(
+					serverConn,
+					getTLSConfig(),
+					getQuicConfig(&quic.Config{
+						EnableDatagrams: true,
+						Versions:        []protocol.VersionNumber{version},
+					}),
+				)
+				Expect(err).ToNot(HaveOccurred())
+				go func() {
+					defer GinkgoRecover()
+					sess, err := ln.Accept(context.Background())
+					Expect(err).ToNot(HaveOccurred())
+					Expect(sess.ConnectionState().SupportsDatagrams).To(BeTrue())
+
+					var wg sync.WaitGroup
+					wg.Add(num)
+					for i := 0; i < num; i++ {
+						go func(i int) {
+							defer GinkgoRecover()
+							defer wg.Done()
+							b := make([]byte, 8)
+							binary.BigEndian.PutUint64(b, uint64(i))
+							Expect(sess.SendMessage(b)).To(Succeed())
+						}(i)
+					}
+					wg.Wait()
+				}()
+				serverPort := ln.Addr().(*net.UDPAddr).Port
+				proxy, err = quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
+					RemoteAddr: fmt.Sprintf("localhost:%d", serverPort),
+					// drop 10% of Short Header packets sent from the server
+					DropPacket: func(dir quicproxy.Direction, packet []byte) bool {
+						if dir == quicproxy.DirectionIncoming {
+							return false
+						}
+						// don't drop Long Header packets
+						if packet[0]&0x80 == 1 {
+							return false
+						}
+						drop := mrand.Int()%10 == 0
+						if drop {
+							atomic.AddInt32(&dropped, 1)
+						}
+						atomic.AddInt32(&total, 1)
+						return drop
+					},
+				})
+				Expect(err).ToNot(HaveOccurred())
+			}
+
+			BeforeEach(func() {
+				addr, err := net.ResolveUDPAddr("udp", "localhost:0")
+				Expect(err).ToNot(HaveOccurred())
+				clientConn, err = net.ListenUDP("udp", addr)
+				Expect(err).ToNot(HaveOccurred())
+			})
+
+			AfterEach(func() {
+				Expect(proxy.Close()).To(Succeed())
+			})
+
+			It("sends datagrams", func() {
+				startServerAndProxy()
+				raddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("localhost:%d", proxy.LocalPort()))
+				Expect(err).ToNot(HaveOccurred())
+				sess, err := quic.Dial(
+					clientConn,
+					raddr,
+					fmt.Sprintf("localhost:%d", proxy.LocalPort()),
+					getTLSClientConfig(),
+					getQuicConfig(&quic.Config{
+						EnableDatagrams: true,
+						Versions:        []protocol.VersionNumber{version},
+					}),
+				)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(sess.ConnectionState().SupportsDatagrams).To(BeTrue())
+				var counter int
+				for {
+					// Close the session if no message is received for 100 ms.
+					timer := time.AfterFunc(scaleDuration(100*time.Millisecond), func() {
+						sess.CloseWithError(0, "")
+					})
+					if _, err := sess.ReceiveMessage(); err != nil {
+						break
+					}
+					timer.Stop()
+					counter++
+				}
+
+				numDropped := int(atomic.LoadInt32(&dropped))
+				expVal := num - numDropped
+				fmt.Fprintf(GinkgoWriter, "Dropped %d out of %d packets.\n", numDropped, atomic.LoadInt32(&total))
+				fmt.Fprintf(GinkgoWriter, "Received %d out of %d sent datagrams.\n", counter, num)
+				Expect(counter).To(And(
+					BeNumerically(">", expVal*9/10),
+					BeNumerically("<", num),
+				))
+			})
+		})
+	}
+})
diff --git a/integrationtests/self/self_suite_test.go b/integrationtests/self/self_suite_test.go
index 0b17be4c..ea4110ed 100644
--- a/integrationtests/self/self_suite_test.go
+++ b/integrationtests/self/self_suite_test.go
@@ -15,6 +15,7 @@ import (
 	"math/big"
 	mrand "math/rand"
 	"os"
+	"strconv"
 	"sync"
 	"testing"
 	"time"
@@ -317,6 +318,15 @@ func debugLog() bool {
 	return len(logFileName) > 0
 }
 
+func scaleDuration(d time.Duration) time.Duration {
+	scaleFactor := 1
+	if f, err := strconv.Atoi(os.Getenv("TIMESCALE_FACTOR")); err == nil { // parsing "" errors, so this works fine if the env is not set
+		scaleFactor = f
+	}
+	Expect(scaleFactor).ToNot(BeZero())
+	return time.Duration(scaleFactor) * d
+}
+
 func TestSelf(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Self integration tests")
diff --git a/integrationtests/self/timeout_test.go b/integrationtests/self/timeout_test.go
index 898dd415..a642dc75 100644
--- a/integrationtests/self/timeout_test.go
+++ b/integrationtests/self/timeout_test.go
@@ -8,9 +8,7 @@ import (
 	"io/ioutil"
 	mrand "math/rand"
 	"net"
-	"os"
 	"runtime/pprof"
-	"strconv"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -181,15 +179,6 @@ var _ = Describe("Timeout tests", func() {
 	Context("timing out at the right time", func() {
 		var idleTimeout time.Duration
 
-		scaleDuration := func(d time.Duration) time.Duration {
-			scaleFactor := 1
-			if f, err := strconv.Atoi(os.Getenv("TIMESCALE_FACTOR")); err == nil { // parsing "" errors, so this works fine if the env is not set
-				scaleFactor = f
-			}
-			Expect(scaleFactor).ToNot(BeZero())
-			return time.Duration(scaleFactor) * d
-		}
-
 		BeforeEach(func() {
 			idleTimeout = scaleDuration(100 * time.Millisecond)
 		})