diff --git a/tests/test-i386-shift.h b/tests/test-i386-shift.h
index f3795d9f36..c3d8793b8b 100644
--- a/tests/test-i386-shift.h
+++ b/tests/test-i386-shift.h
@@ -108,7 +108,12 @@ void exec_opb(int s0, int s1, int iflags)
 void exec_op(int s2, int s0, int s1)
 {
     exec_opl(s2, s0, s1, 0);
+#ifdef OP_SHIFTD
+    if (s1 <= 15)
+        exec_opw(s2, s0, s1, 0);
+#else
     exec_opw(s2, s0, s1, 0);
+#endif
 #ifndef OP_NOBYTE
     exec_opb(s0, s1, 0);
 #endif