diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh
index 7811fd9b..91a8a436 100755
--- a/tests/test_shells/test.sh
+++ b/tests/test_shells/test.sh
@@ -316,10 +316,21 @@ for exe in bash zsh busybox fish tcsh mksh dash ipython ; do
 			fish_version="${fish_version##* }"
 			fish_version_major="${fish_version%%.*}"
 			fish_version_minor="${fish_version#*.}"
+			fish_version_patch="${fish_version_minor#*.}"
+			fish_version_dev="${fish_version_patch#*-}"
+			if test "$fish_version_dev" = "$fish_version_patch" ; then
+				fish_version_dev=""
+			fi
 			fish_version_minor="${fish_version_minor%%.*}"
+			fish_version_patch="${fish_version_patch%%-*}"
 			if test $fish_version_major -lt 2 || ( \
-				test $fish_version_major -eq 2 && \
-				test $fish_version_minor -lt 1 \
+				test $fish_version_major -eq 2 && (\
+					test $fish_version_minor -lt 1 || (\
+						test $fish_version_minor -eq 1 &&
+						test $fish_version_patch -lt 2 && \
+						test -z "$fish_version_dev"
+					) \
+				) \
 			) ; then
 				continue
 			fi