diff --git a/target-i386/op.c b/target-i386/op.c
index 933595da653f55444e2200bf0e2b73e8382e1961..fed0fca93cbe6cf22316bf6a7b1765da02c775c0 100644
--- a/target-i386/op.c
+++ b/target-i386/op.c
@@ -1366,6 +1366,11 @@ void OPPROTO op_set_cc_op(void)
     CC_OP = PARAM1;
 }
 
+void OPPROTO op_mov_T0_cc(void)
+{
+    T0 = cc_table[CC_OP].compute_all();
+}
+
 /* XXX: clear VIF/VIP in all ops ? */
 
 void OPPROTO op_movl_eflags_T0(void)
diff --git a/target-i386/ops_template.h b/target-i386/ops_template.h
index 35d5b541218269556919ad90410b2bce17674db4..373b77a2451f9be73cf808b788ef697214cef222 100644
--- a/target-i386/ops_template.h
+++ b/target-i386/ops_template.h
@@ -339,18 +339,14 @@ void OPPROTO glue(op_jle_sub, SUFFIX)(void)
 
 void OPPROTO glue(op_loopnz, SUFFIX)(void)
 {
-    int eflags;
-    eflags = cc_table[CC_OP].compute_all();
-    if ((DATA_TYPE)ECX != 0 && !(eflags & CC_Z))
+    if ((DATA_TYPE)ECX != 0 && !(T0 & CC_Z))
         GOTO_LABEL_PARAM(1);
     FORCE_RET();
 }
 
 void OPPROTO glue(op_loopz, SUFFIX)(void)
 {
-    int eflags;
-    eflags = cc_table[CC_OP].compute_all();
-    if ((DATA_TYPE)ECX != 0 && (eflags & CC_Z))
+    if ((DATA_TYPE)ECX != 0 && (T0 & CC_Z))
         GOTO_LABEL_PARAM(1);
     FORCE_RET();
 }
diff --git a/target-i386/translate.c b/target-i386/translate.c
index a3005d8d536feada4f2d9134798fed15be939568..093723944c4e328fdda47ed1bc0648ed3c3c718f 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -5271,6 +5271,8 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
                 gen_op_jz_ecx[s->aflag](l1);
             } else {
                 gen_op_dec_ECX[s->aflag]();
+                if (b <= 1)
+                    gen_op_mov_T0_cc();
                 gen_op_loop[s->aflag][b](l1);
             }