diff --git a/tools/testing/selftests/net/bareudp.sh b/tools/testing/selftests/net/bareudp.sh
index d9e5b967f815..15f102143fd3 100755
--- a/tools/testing/selftests/net/bareudp.sh
+++ b/tools/testing/selftests/net/bareudp.sh
@@ -105,16 +105,27 @@
 # |                    (encapsulated with MPLS label 200)                 |
 # |                                                                       |
 # +-----------------------------------------------------------------------+
+#
+# Besides the ping tests, a file is copied over TCP from NS0 to NS3 with
+# socat for the IPv4 and IPv6 overlays. UDP tunnel segmentation offload is
+# disabled on veth12 and veth21, so that the GSO packets encapsulated by
+# bareudp are segmented in software. These two veths get a larger MTU to fit
+# the encapsulation.
 
 . ./lib.sh
 
 ERR=4 # Return 4 by default, which is the SKIP code for kselftest
 PING6="ping"
 PAUSE_ON_FAIL="no"
+STREAM="yes"
+STREAM_PORT=5000
+STREAM_TIMEOUT=10
+TMPFILE=""
 
 # Exit the script after having removed the network namespaces it created
 exit_cleanup()
 {
+	[ -n "${TMPFILE}" ] && rm -f "${TMPFILE}"
 	cleanup_all_ns
 
 	if [ "${ERR}" -eq 4 ]; then
@@ -180,6 +191,29 @@ setup_underlay()
 
 	tc -netns "${NS1}" qdisc add dev veth10 ingress
 	tc -netns "${NS2}" qdisc add dev veth23 ingress
+
+	if [ "${STREAM}" = "yes" ]; then
+		# Leave room for the encapsulation on the underlay, so that full
+		# sized packets from NS0 can be tunnelled without fragmentation
+		ip -netns "${NS1}" link set dev veth12 mtu 1600
+		ip -netns "${NS2}" link set dev veth21 mtu 1600
+
+		# Segment the encapsulated GSO packets in software
+		ip netns exec "${NS1}" ethtool -K veth12 \
+			tx-udp_tnl-segmentation off \
+			tx-udp_tnl-csum-segmentation off
+		ip netns exec "${NS2}" ethtool -K veth21 \
+			tx-udp_tnl-segmentation off \
+			tx-udp_tnl-csum-segmentation off
+
+		TMPFILE=$(mktemp)
+		dd if=/dev/urandom of="${TMPFILE}" bs=1M count=16 status=none
+
+		ip netns exec "${NS3}" socat -u \
+			TCP6-LISTEN:"${STREAM_PORT}",ipv6only=0,reuseaddr,fork \
+			OPEN:/dev/null &
+		wait_local_port_listen "${NS3}" "${STREAM_PORT}" tcp
+	fi
 }
 
 # Set up the IPv4, IPv6 and MPLS overlays.
@@ -252,9 +286,6 @@ setup_overlay_mpls()
 #   * $2: the IP address to ping,
 #   * $3: a human readable description of the purpose of the test.
 #
-# If the test fails and PAUSE_ON_FAIL is active, the user is given the
-# possibility to continue with the next test or to quit immediately.
-#
 ping_test_one()
 {
 	local PING="$1"; readonly PING
@@ -269,7 +300,50 @@ ping_test_one()
 	RET=$?
 	set -e
 
-	if [ "${RET}" -eq 0 ]; then
+	report_result "${RET}"
+}
+
+# Copy a file over TCP from NS0 to NS3 and print the result
+#
+# Parameters:
+#
+#   * $1: the socat address of the receiver,
+#   * $2: a human readable description of the purpose of the test.
+#
+stream_test_one()
+{
+	local ADDR="$1"; readonly ADDR
+	local MSG="$2"; readonly MSG
+	local RET
+
+	printf "TEST: %-60s  " "${MSG}"
+
+	if [ "${STREAM}" != "yes" ]; then
+		printf "[SKIP]\n"
+		return
+	fi
+
+	set +e
+	ip netns exec "${NS0}" timeout "${STREAM_TIMEOUT}" \
+		socat -u OPEN:"${TMPFILE}" "${ADDR}" > /dev/null 2>&1
+	RET=$?
+	set -e
+
+	report_result "${RET}"
+}
+
+# Print the result of a test
+#
+# Parameters:
+#
+#   * $1: the exit code of the test.
+#
+# If the test fails and PAUSE_ON_FAIL is active, the user is given the
+# possibility to continue with the next test or to quit immediately.
+#
+report_result()
+{
+	if [ "$1" -eq 0 ]; then
 		printf "[ OK ]\n"
 	else
 		ERR=1
@@ -307,9 +381,13 @@ ping_test()
 
 	if [ $IPV4 ]; then
 		ping_test_one "ping" "192.0.2.103" "IPv4 packets over ${UNDERLAY}${MODE}"
+		stream_test_one "TCP4:192.0.2.103:${STREAM_PORT}" \
+			"IPv4 stream over ${UNDERLAY}${MODE}"
 	fi
 	if [ $IPV6 ]; then
 		ping_test_one "${PING6}" "2001:db8::103" "IPv6 packets over ${UNDERLAY}${MODE}"
+		stream_test_one "TCP6:[2001:db8::103]:${STREAM_PORT}" \
+			"IPv6 stream over ${UNDERLAY}${MODE}"
 	fi
 	if [ $MPLS_UC ]; then
 		ping_test_one "${PING6}" "2001:db8::203" "Unicast MPLS packets over ${UNDERLAY}${MODE}"
@@ -471,6 +549,12 @@ check_features()
 
 	# Use ping6 on systems where ping doesn't handle IPv6
 	ping -w 1 -c 1 ::1 > /dev/null 2>&1 || PING6="ping6"
+
+	if [ ! -x "$(command -v socat)" ] ||
+	   [ ! -x "$(command -v ethtool)" ]; then
+		echo "socat or ethtool not found, skipping the stream tests" >&2
+		STREAM="no"
+	fi
 }
 
 usage()