diff --git a/stream_framer.go b/stream_framer.go
index c4021ca6..1f2f9708 100644
--- a/stream_framer.go
+++ b/stream_framer.go
@@ -125,7 +125,7 @@ func (f *streamFramer) maybePopNormalFrames(maxBytes protocol.ByteCount) (res []
 		return true, nil
 	}
 
-	f.streamsMap.Iterate(fn)
+	f.streamsMap.RoundRobinIterate(fn)
 
 	return
 }
diff --git a/stream_framer_test.go b/stream_framer_test.go
index 476356d8..e8e742f0 100644
--- a/stream_framer_test.go
+++ b/stream_framer_test.go
@@ -117,6 +117,19 @@ var _ = Describe("Stream Framer", func() {
 			Expect(fs[0].FinBit).To(BeFalse())
 		})
 
+		It("uses the round-robin scheduling", func() {
+			stream1.dataForWriting = bytes.Repeat([]byte("f"), 100)
+			stream2.dataForWriting = bytes.Repeat([]byte("e"), 100)
+			fs := framer.PopStreamFrames(10)
+			Expect(fs).To(HaveLen(1))
+			// it doesn't matter here if this data is from stream1 or from stream2...
+			firstStreamID := fs[0].StreamID
+			fs = framer.PopStreamFrames(10)
+			Expect(fs).To(HaveLen(1))
+			// ... but the data popped this time has to be from the other stream
+			Expect(fs[0].StreamID).ToNot(Equal(firstStreamID))
+		})
+
 		Context("splitting of frames", func() {
 			It("splits off nothing", func() {
 				f := &frames.StreamFrame{