diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.fixed1 b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed1
new file mode 100644
index 0000000000..c25c75601e
--- /dev/null
+++ b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed1
@@ -0,0 +1,4 @@
+1.2.3.4
+1.2.3.3
+1.2.3.2
+1.2.3.1
diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.fixed2 b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed2
new file mode 100644
index 0000000000..e8deb6717d
--- /dev/null
+++ b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed2
@@ -0,0 +1,4 @@
+1.2.3.3
+1.2.3.2
+1.2.3.1
+1.2.3.4
diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.fixed3 b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed3
new file mode 100644
index 0000000000..3b27693958
--- /dev/null
+++ b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed3
@@ -0,0 +1,4 @@
+1.2.3.2
+1.2.3.1
+1.2.3.4
+1.2.3.3
diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.fixed4 b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed4
new file mode 100644
index 0000000000..d2ca6fc366
--- /dev/null
+++ b/bin/tests/system/rrsetorder/dig.out.cyclic.fixed4
@@ -0,0 +1,4 @@
+1.2.3.1
+1.2.3.4
+1.2.3.3
+1.2.3.2
diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index 2ebe9a6844..fd1b4ebf6a 100644
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.9 2011/12/23 00:38:23 marka Exp $
+# $Id: tests.sh,v 1.10 2011/12/23 01:06:42 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -66,10 +66,18 @@ $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
 	match=0
 	for j in 1 2 3 4
 	do
-		eval "cmp -s dig.out.cyclic dig.out.cyclic.good$j && match$j=1 match=1"
+		if $test_fixed; then
+			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
+				eval "match$j=1 match=1";
+			}
+		else
+			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
+				eval "match$j=1 match=1";
+			}
+		fi
 		if [ $match -eq 1 ]; then break; fi
 	done
-	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; fi
+	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; cat dig.out.cyclic; fi
 done
 match=0
 for i in 1 2 3 4
@@ -146,7 +154,15 @@ $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
 	match=0
 	for j in 1 2 3 4
 	do
-		eval "cmp -s dig.out.cyclic dig.out.cyclic.good$j && match$j=1 match=1"
+		if $test_fixed; then
+			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
+				eval "match$j=1 match=1";
+			}
+		else
+			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
+				eval "match$j=1 match=1";
+			}
+		fi
 		if [ $match -eq 1 ]; then break; fi
 	done
 	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; fi
@@ -246,7 +262,15 @@ $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
 	match=0
 	for j in 1 2 3 4
 	do
-		eval "cmp -s dig.out.cyclic dig.out.cyclic.good$j && match$j=1 match=1"
+		if $test_fixed; then
+			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
+				eval "match$j=1 match=1";
+			}
+		else
+			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
+				eval "match$j=1 match=1";
+			}
+		fi
 		if [ $match -eq 1 ]; then break; fi
 	done
 	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; fi
@@ -326,7 +350,15 @@ $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
 	match=0
 	for j in 1 2 3 4
 	do
-		eval "cmp -s dig.out.cyclic dig.out.cyclic.good$j && match$j=1 match=1"
+		if $test_fixed; then
+			cmp -s dig.out.cyclic dig.out.cyclic.fixed$j && {
+				eval "match$j=1 match=1";
+			}
+		else
+			cmp -s dig.out.cyclic dig.out.cyclic.good$j && {
+				eval "match$j=1 match=1";
+			}
+		fi
 		if [ $match -eq 1 ]; then break; fi
 	done
 	if [ $match -eq 0 ]; then ret=1; echo "I:unexpected order"; fi