diff --git a/gbn/gbn_conn.go b/gbn/gbn_conn.go
index 2ff4ffcb..98b9ff5e 100644
--- a/gbn/gbn_conn.go
+++ b/gbn/gbn_conn.go
@@ -20,7 +20,7 @@ var (
 const (
 	DefaultN                = 20
 	defaultHandshakeTimeout = 100 * time.Millisecond
-	defaultResendTimeout    = 100 * time.Millisecond
+	defaultResendTimeout    = 2000 * time.Millisecond
 	finSendTimeout          = 1000 * time.Millisecond
 	defaultResendMultiplier = 5
 	DefaultSendTimeout      = math.MaxInt64
diff --git a/mailbox/client_conn.go b/mailbox/client_conn.go
index 95cf2135..2599b54d 100644
--- a/mailbox/client_conn.go
+++ b/mailbox/client_conn.go
@@ -43,7 +43,7 @@ const (
 
 	// gbnTimeout is the timeout that we want the gbn connection to wait
 	// to receive ACKS from the peer before resending the queue.
-	gbnTimeout = 1000 * time.Millisecond
+	gbnTimeout = 2000 * time.Millisecond
 
 	// gbnN is the queue size, N, that the gbn server will use. The gbn
 	// server will send up to N packets before requiring an ACK for the