diff --git a/plans/tier1.fmf b/plans/tier1.fmf
index 789d9e64f1..6a8dddb288 100644
--- a/plans/tier1.fmf
+++ b/plans/tier1.fmf
@@ -133,3 +133,17 @@ discover+:
   - name: reboot machine
     how: ansible
     playbook: tests/ansible_collections/reboot.yml
+
+/language_test:
+  discover+:
+    test: checks-after-conversion
+  prepare+:
+  - name: set non english locale
+    how: shell
+    script: pytest -svv tests/integration/tier1/set-locale/use_non_english_language.py
+  - name: main conversion preparation
+    how: shell
+    script: pytest -svv tests/integration/tier1/method/activation_key.py
+  - name: reboot machine
+    how: ansible
+    playbook: tests/ansible_collections/reboot.yml
diff --git a/tests/integration/tier0/resolve-broken-ol8-rollback/.test_resolve_broken_ol8_rollback.py.swp b/tests/integration/tier0/resolve-broken-ol8-rollback/.test_resolve_broken_ol8_rollback.py.swp
new file mode 100644
index 0000000000..ff8bae5944
Binary files /dev/null and b/tests/integration/tier0/resolve-broken-ol8-rollback/.test_resolve_broken_ol8_rollback.py.swp differ
diff --git a/tests/integration/tier1/set-locale/use_non_english_language.py b/tests/integration/tier1/set-locale/use_non_english_language.py
new file mode 100644
index 0000000000..73a3d1749f
--- /dev/null
+++ b/tests/integration/tier1/set-locale/use_non_english_language.py
@@ -0,0 +1,12 @@
+def test_use_non_english_language(shell):
+    """
+    We need to test the ability of convert2rhel to convert the system when non english
+    language is set.
+    """
+    # install French language pack
+    # assert shell("yum install langpacks-fr -y").returncode == 0
+    assert shell("export LANG=fr_FR.UTF-8").returncode == 0
+    # assert shell("export LC_NUMERIC=fr_FR.UTF-8").returncode == 0
+
+    assert shell("localectl set-locale LANG=zh_CN.utf8").returncode == 0
+    assert shell("export LC_NUMERIC=zh_CN.utf8").returncode == 0