diff --git a/test/setup.cfg b/test/setup.cfg
index a377a59a4cc..459deb9f2ee 100644
--- a/test/setup.cfg
+++ b/test/setup.cfg
@@ -3,6 +3,7 @@ minversion = 3.6
 markers =
     bashcomp
     complete
+xfail_strict=true
 
 [mypy]
 python_version = 3.6
diff --git a/test/t/test_alias.py b/test/t/test_alias.py
index 0a9eb3bee0e..37ecc46e8df 100644
--- a/test/t/test_alias.py
+++ b/test/t/test_alias.py
@@ -10,7 +10,6 @@ class TestAlias:
     def test_1(self, completion):
         assert completion == "bar foo".split()
 
-    @pytest.mark.xfail  # TODO: Would like this completion to work
     @pytest.mark.complete("alias foo=")
     def test_2(self, completion):
         assert completion == "foo='bar'"
diff --git a/test/t/test_mkdir.py b/test/t/test_mkdir.py
index afc3fd0430a..e33b49e1106 100644
--- a/test/t/test_mkdir.py
+++ b/test/t/test_mkdir.py
@@ -10,11 +10,9 @@ def test_1(self, completion):
     def test_2(self, completion):
         assert completion == ["bar", "bar bar.d/", "foo", "foo.d/"]
 
-    @pytest.mark.xfail  # TODO: why path in completion, basename in .output?
     @pytest.mark.complete("mkdir shared/default/foo.d/")
     def test_3(self, completion):
-        assert completion.output == "foo"
-        assert completion == [completion.output]
+        assert completion == ["foo"]
 
     @pytest.mark.complete("mkdir -", require_longopt=True)
     def test_options(self, completion):
diff --git a/test/t/unit/test_unit_compgen_filedir.py b/test/t/unit/test_unit_compgen_filedir.py
index aa18868c76d..e54f714a456 100644
--- a/test/t/unit/test_unit_compgen_filedir.py
+++ b/test/t/unit/test_unit_compgen_filedir.py
@@ -230,7 +230,6 @@ def test_26(self, bash, functions, funcname):
         )
         assert completion == 'h"'
 
-    @pytest.mark.xfail(reason="TODO: non-ASCII issues with test suite?")
     @pytest.mark.parametrize("funcname", "f f2".split())
     def test_27(self, bash, functions, funcname, utf8_ctype):
         completion = assert_complete(bash, "%s aé/" % funcname, cwd="_filedir")
diff --git a/test/t/unit/test_unit_compgen_ip_addresses.py b/test/t/unit/test_unit_compgen_ip_addresses.py
index 90c4b47bc4f..1df52f8eee7 100644
--- a/test/t/unit/test_unit_compgen_ip_addresses.py
+++ b/test/t/unit/test_unit_compgen_ip_addresses.py
@@ -1,6 +1,6 @@
 import pytest
 
-from conftest import assert_bash_exec, in_container
+from conftest import assert_bash_exec
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
@@ -41,7 +41,6 @@ def test_3(self, functions, completion):
         assert completion
         assert all("." in x for x in completion)
 
-    @pytest.mark.xfail(in_container(), reason="Probably fails in a container")
     @pytest.mark.complete("ia6 ")
     def test_4(self, functions, completion):
         """_comp_compgen_ip_addresses -6 should complete ipv6 addresses."""
diff --git a/test/t/unit/test_unit_get_cword.py b/test/t/unit/test_unit_get_cword.py
index d2bb526bc7b..b27a794292f 100644
--- a/test/t/unit/test_unit_get_cword.py
+++ b/test/t/unit/test_unit_get_cword.py
@@ -140,7 +140,6 @@ def test_23(self, bash):
         output = self._test(bash, '(a "\'b&c")', 1, "a 'b&c", 6)
         assert output == "'b&c"
 
-    @pytest.mark.xfail(reason="TODO: non-ASCII issues with test suite?")
     def test_24(self, bash):
         """Index shouldn't drop below 0"""
         bash.send("scp ääää§ se\t\r\n")