diff --git a/lib/packets.h b/lib/packets.h
index 188cf8439..5b12df705 100644
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -722,9 +722,9 @@ BUILD_ASSERT_DECL(TCP_HEADER_LEN == sizeof(struct tcp_header));
 #define CS_NEW               0x01
 #define CS_ESTABLISHED       0x02
 #define CS_RELATED           0x04
-#define CS_INVALID           0x20
-#define CS_REPLY_DIR         0x40
-#define CS_TRACKED           0x80
+#define CS_REPLY_DIR         0x08
+#define CS_INVALID           0x10
+#define CS_TRACKED           0x20
 
 /* Undefined connection state bits. */
 #define CS_SUPPORTED_MASK    (CS_NEW | CS_ESTABLISHED | CS_RELATED \
diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
index 7375cadbf..247e3da09 100644
--- a/tests/ovs-ofctl.at
+++ b/tests/ovs-ofctl.at
@@ -824,10 +824,10 @@ NXM_NX_REG0_W(a0e0d050/ffffffff)
 NXM_NX_REG0_W(00000000/00000000)
 
 # Connection tracking fields,
-NXM_OF_ETH_TYPE(0800) NXM_NX_CT_STATE(00000080)
+NXM_OF_ETH_TYPE(0800) NXM_NX_CT_STATE(00000020)
 NXM_OF_ETH_TYPE(0800) NXM_NX_CT_STATE(00001080)
-NXM_OF_ETH_TYPE(0800) NXM_NX_CT_STATE_W(00000080/00000080)
-NXM_OF_ETH_TYPE(0800) NXM_NX_CT_STATE_W(00000080/000000F0)
+NXM_OF_ETH_TYPE(0800) NXM_NX_CT_STATE_W(00000020/00000020)
+NXM_OF_ETH_TYPE(0800) NXM_NX_CT_STATE_W(00000020/000000F0)
 NXM_OF_ETH_TYPE(0800) NXM_NX_CT_ZONE(5a5a)
 NXM_OF_ETH_TYPE(0800) NXM_NX_CT_MARK(5a5a5a5a)
 NXM_OF_ETH_TYPE(0800) NXM_NX_CT_MARK_W(5a5a5a5a/fefefefe)
@@ -1129,10 +1129,10 @@ NXM_NX_REG0(a0e0d050)
 dnl
 dnl When re-serialising, bits 16-31 are wildcarded, because current OVS userspace
 dnl doesn't understand (or store) those bits.
-NXM_OF_ETH_TYPE(0800), NXM_NX_CT_STATE_W(00000080/0000ffff)
+NXM_OF_ETH_TYPE(0800), NXM_NX_CT_STATE_W(00000020/0000ffff)
 nx_pull_match() returned error OFPBMC_BAD_VALUE
-NXM_OF_ETH_TYPE(0800), NXM_NX_CT_STATE_W(00000080/00000080)
-NXM_OF_ETH_TYPE(0800), NXM_NX_CT_STATE_W(00000080/000000f0)
+NXM_OF_ETH_TYPE(0800), NXM_NX_CT_STATE_W(00000020/00000020)
+NXM_OF_ETH_TYPE(0800), NXM_NX_CT_STATE_W(00000020/000000f0)
 NXM_OF_ETH_TYPE(0800), NXM_NX_CT_ZONE(5a5a)
 NXM_OF_ETH_TYPE(0800), NXM_NX_CT_MARK(5a5a5a5a)
 NXM_OF_ETH_TYPE(0800), NXM_NX_CT_MARK_W(5a5a5a5a/fefefefe)