diff --git a/integrationtests/drop_test.go b/integrationtests/drop_test.go
index ef4aa2f2..6a287047 100644
--- a/integrationtests/drop_test.go
+++ b/integrationtests/drop_test.go
@@ -43,7 +43,7 @@ var _ = Describe("Drop Proxy", func() {
 			"https://quic.clemente.io/data",
 		)
 
-		session, err := Start(command, nil, GinkgoWriter)
+		session, err := Start(command, GinkgoWriter, GinkgoWriter)
 		Expect(err).NotTo(HaveOccurred())
 		defer session.Kill()
 		Eventually(session, 4).Should(Exit(0))
@@ -61,7 +61,7 @@ var _ = Describe("Drop Proxy", func() {
 		Context(fmt.Sprintf("with quic version %d", version), func() {
 			Context("dropping every 4th packet after the crypto handshake", func() {
 				dropper := func(p protocol.PacketNumber) bool {
-					if p <= 5 { // don't interfere with the crypto handshake
+					if p <= 10 { // don't interfere with the crypto handshake
 						return false
 					}
 					return p%4 == 0
diff --git a/integrationtests/proxy/udp_proxy.go b/integrationtests/proxy/udp_proxy.go
index 5e99a5d6..0271d6b6 100644
--- a/integrationtests/proxy/udp_proxy.go
+++ b/integrationtests/proxy/udp_proxy.go
@@ -151,15 +151,17 @@ func (p *UDPProxy) runConnection(conn *connection) error {
 		}
 
 		raw := buffer[0:n]
-		r := bytes.NewReader(raw)
-		hdr, err := quic.ParsePublicHeader(r)
-		if err != nil {
-			return err
-		}
 
-		atomic.AddUint64(&conn.outgoingPacketCounter, 1)
+		// TODO: Switch back to using the public header once Chrome properly sets the type byte.
+		// r := bytes.NewReader(raw)
+		// , err := quic.ParsePublicHeader(r)
+		// if err != nil {
+		// return err
+		// }
 
-		if !p.dropOutgoingPacket(hdr.PacketNumber) {
+		v := atomic.AddUint64(&conn.outgoingPacketCounter, 1)
+
+		if !p.dropOutgoingPacket(protocol.PacketNumber(v)) {
 			// Relay it to client
 			go func() {
 				time.Sleep(p.rttGen.getRTT() / 2)