diff --git a/.travis.yml b/.travis.yml
index aaa30c4c5..a2829f57d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,13 +51,6 @@ jobs:
     env: BUILD_WHEELS=1
     script: tools/wheels/build-wheels.sh ${LIBRDKAFKA_VERSION#v} wheelhouse
 
-  - name: "Wheels: MacOSX x64"
-    if: tag is present
-    os: osx
-    language: shell
-    env: BUILD_WHEELS=1
-    script: tools/wheels/build-wheels.sh ${LIBRDKAFKA_VERSION#v} wheelhouse
-
 install:
  # Install interceptors
  - tools/install-interceptors.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cebfecfb..136dd4110 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Confluent's Python client for Apache Kafka
 
 
-## v1.9.3
+## Next Version
 
  - Added metadata to `TopicPartition` type and `commit()` (#1410).
  - Added `consumer.memberid()` for getting member id assigned to 
    the consumer in a consumer group (#1154).
+ - Added Python 3.11 wheels
 
 
 ## v1.9.2
diff --git a/tests/test_Producer.py b/tests/test_Producer.py
index ef82b4142..41eac1f0c 100644
--- a/tests/test_Producer.py
+++ b/tests/test_Producer.py
@@ -206,8 +206,8 @@ def test_transaction_api():
     # Any subsequent APIs will fail since init did not succeed.
     with pytest.raises(KafkaException) as ex:
         p.begin_transaction()
-    assert ex.value.args[0].code() == KafkaError._STATE
-    assert ex.value.args[0].retriable() is False
+    assert ex.value.args[0].code() == KafkaError._CONFLICT
+    assert ex.value.args[0].retriable() is True
     assert ex.value.args[0].fatal() is False
     assert ex.value.args[0].txn_requires_abort() is False
 
@@ -218,22 +218,22 @@ def test_transaction_api():
     with pytest.raises(KafkaException) as ex:
         p.send_offsets_to_transaction([TopicPartition("topic", 0, 123)],
                                       group_metadata)
-    assert ex.value.args[0].code() == KafkaError._STATE
-    assert ex.value.args[0].retriable() is False
+    assert ex.value.args[0].code() == KafkaError._CONFLICT
+    assert ex.value.args[0].retriable() is True
     assert ex.value.args[0].fatal() is False
     assert ex.value.args[0].txn_requires_abort() is False
 
     with pytest.raises(KafkaException) as ex:
         p.commit_transaction(0.5)
-    assert ex.value.args[0].code() == KafkaError._STATE
-    assert ex.value.args[0].retriable() is False
+    assert ex.value.args[0].code() == KafkaError._CONFLICT
+    assert ex.value.args[0].retriable() is True
     assert ex.value.args[0].fatal() is False
     assert ex.value.args[0].txn_requires_abort() is False
 
     with pytest.raises(KafkaException) as ex:
         p.abort_transaction(0.5)
-    assert ex.value.args[0].code() == KafkaError._STATE
-    assert ex.value.args[0].retriable() is False
+    assert ex.value.args[0].code() == KafkaError._CONFLICT
+    assert ex.value.args[0].retriable() is True
     assert ex.value.args[0].fatal() is False
     assert ex.value.args[0].txn_requires_abort() is False
 
diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat
index 03b4d327e..ec217f9e5 100644
--- a/tools/wheels/build-wheels.bat
+++ b/tools/wheels/build-wheels.bat
@@ -13,7 +13,7 @@ set WHEELHOUSE=%4
 if [%WHEELHOUSE%]==[] goto usage
 echo on
 
-set CIBW_BUILD=cp36-%BW_ARCH% cp37-%BW_ARCH% cp38-%BW_ARCH% cp39-%BW_ARCH% cp310-%BW_ARCH%
+set CIBW_BUILD=cp36-%BW_ARCH% cp37-%BW_ARCH% cp38-%BW_ARCH% cp39-%BW_ARCH% cp310-%BW_ARCH% cp311-%BW_ARCH%
 set CIBW_BEFORE_BUILD=python -m pip install delvewheel==0.0.6
 set CIBW_TEST_REQUIRES=-r tests/requirements.txt
 set CIBW_TEST_COMMAND=pytest {project}\tests\test_Producer.py
@@ -25,7 +25,7 @@ set CIBW_REPAIR_WHEEL_COMMAND=python -m delvewheel repair --add-path %DLL_DIR% -
 
 set PATH=%PATH%;c:\Program Files\Git\bin\
 
-python -m pip install cibuildwheel==2.7.0 || goto :error
+python -m pip install cibuildwheel==2.11.2 || goto :error
 
 python -m cibuildwheel --output-dir %WHEELHOUSE% --platform windows || goto :error
 
diff --git a/tools/wheels/build-wheels.sh b/tools/wheels/build-wheels.sh
index 681798e1f..ac4ccb13e 100755
--- a/tools/wheels/build-wheels.sh
+++ b/tools/wheels/build-wheels.sh
@@ -52,7 +52,7 @@ esac
 
 $this_dir/install-librdkafka.sh $librdkafka_version dest
 
-install_pkgs=cibuildwheel==2.8.1
+install_pkgs=cibuildwheel==2.11.2
 
 python3 -m pip install ${PIP_INSTALL_OPTS} $install_pkgs ||
     pip3 install ${PIP_INSTALL_OPTS} $install_pkgs