diff --git a/test/completion/objcopy.exp b/test/completion/objcopy.exp
deleted file mode 100644
index 579d9ba9154..00000000000
--- a/test/completion/objcopy.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions objcopy
diff --git a/test/completion/objdump.exp b/test/completion/objdump.exp
deleted file mode 100644
index 786898424d3..00000000000
--- a/test/completion/objdump.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions objdump
diff --git a/test/completion/od.exp b/test/completion/od.exp
deleted file mode 100644
index e9ec0f8f56a..00000000000
--- a/test/completion/od.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions od
diff --git a/test/completion/oggdec.exp b/test/completion/oggdec.exp
deleted file mode 100644
index b18643d586c..00000000000
--- a/test/completion/oggdec.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions oggdec
diff --git a/test/completion/opera.exp b/test/completion/opera.exp
deleted file mode 100644
index 9ab6a08f296..00000000000
--- a/test/completion/opera.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions opera
diff --git a/test/completion/optipng.exp b/test/completion/optipng.exp
deleted file mode 100644
index b320754338c..00000000000
--- a/test/completion/optipng.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions optipng
diff --git a/test/lib/completions/objcopy.exp b/test/lib/completions/objcopy.exp
deleted file mode 100644
index 29be7e62f69..00000000000
--- a/test/lib/completions/objcopy.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "objcopy "
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions/objdump.exp b/test/lib/completions/objdump.exp
deleted file mode 100644
index c1f62e359a5..00000000000
--- a/test/lib/completions/objdump.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "objdump "
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions/od.exp b/test/lib/completions/od.exp
deleted file mode 100644
index e2712d12256..00000000000
--- a/test/lib/completions/od.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "od "
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions/oggdec.exp b/test/lib/completions/oggdec.exp
deleted file mode 100644
index 18b0f949262..00000000000
--- a/test/lib/completions/oggdec.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "oggdec "
-sync_after_int
-
-assert_complete_any "oggdec --"
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions/opera.exp b/test/lib/completions/opera.exp
deleted file mode 100644
index 9b666403780..00000000000
--- a/test/lib/completions/opera.exp
+++ /dev/null
@@ -1,18 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "opera "
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions/optipng.exp b/test/lib/completions/optipng.exp
deleted file mode 100644
index 0a079190a05..00000000000
--- a/test/lib/completions/optipng.exp
+++ /dev/null
@@ -1,18 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "optipng "
-sync_after_int
-
-
-teardown
diff --git a/test/t/Makefile.am b/test/t/Makefile.am
index cb1a1b60ba3..5641a76ac5c 100644
--- a/test/t/Makefile.am
+++ b/test/t/Makefile.am
@@ -1,5 +1,11 @@
 EXTRA_DIST = \
 	conftest.py \
+	test_objcopy.py \
+	test_objdump.py \
+	test_od.py \
+	test_oggdec.py \
+	test_opera.py \
+	test_optipng.py \
 	test_pkgadd.py \
 	test_qemu.py \
 	test_qrunner.py \
diff --git a/test/t/test_objcopy.py b/test/t/test_objcopy.py
new file mode 100644
index 00000000000..713d9ffeb85
--- /dev/null
+++ b/test/t/test_objcopy.py
@@ -0,0 +1,8 @@
+import pytest
+
+
+class Test(object):
+
+    @pytest.mark.complete("objcopy ")
+    def test_(self, completion):
+        assert completion.list
diff --git a/test/t/test_objdump.py b/test/t/test_objdump.py
new file mode 100644
index 00000000000..973a5a47828
--- /dev/null
+++ b/test/t/test_objdump.py
@@ -0,0 +1,8 @@
+import pytest
+
+
+class Test(object):
+
+    @pytest.mark.complete("objdump ")
+    def test_(self, completion):
+        assert completion.list
diff --git a/test/t/test_od.py b/test/t/test_od.py
new file mode 100644
index 00000000000..b765eb32d57
--- /dev/null
+++ b/test/t/test_od.py
@@ -0,0 +1,8 @@
+import pytest
+
+
+class Test(object):
+
+    @pytest.mark.complete("od ")
+    def test_(self, completion):
+        assert completion.list
diff --git a/test/t/test_oggdec.py b/test/t/test_oggdec.py
new file mode 100644
index 00000000000..0f5a491f05e
--- /dev/null
+++ b/test/t/test_oggdec.py
@@ -0,0 +1,12 @@
+import pytest
+
+
+class Test(object):
+
+    @pytest.mark.complete("oggdec ")
+    def test_(self, completion):
+        assert completion.list
+
+    @pytest.mark.complete("oggdec --")
+    def test_dash(self, completion):
+        assert completion.list
diff --git a/test/t/test_opera.py b/test/t/test_opera.py
new file mode 100644
index 00000000000..0c7d4e034fc
--- /dev/null
+++ b/test/t/test_opera.py
@@ -0,0 +1,8 @@
+import pytest
+
+
+class Test(object):
+
+    @pytest.mark.complete("opera ")
+    def test_(self, completion):
+        assert completion.list
diff --git a/test/t/test_optipng.py b/test/t/test_optipng.py
new file mode 100644
index 00000000000..cf750f9f2f1
--- /dev/null
+++ b/test/t/test_optipng.py
@@ -0,0 +1,8 @@
+import pytest
+
+
+class Test(object):
+
+    @pytest.mark.complete("optipng ")
+    def test_(self, completion):
+        assert completion.list