diff --git a/aio_dio_bugs/aio_dio_bugs.py b/aio_dio_bugs/aio_dio_bugs.py
index 8d8196108..62e29b6d9 100644
--- a/aio_dio_bugs/aio_dio_bugs.py
+++ b/aio_dio_bugs/aio_dio_bugs.py
@@ -4,18 +4,6 @@
 
 
 
-# tests is a simple array of "cmd" "arguments"
-tests = [["aio-dio-invalidate-failure", "poo"],
-         ["aio-dio-subblock-eof-read", "eoftest"],
-         ["aio-free-ring-with-bogus-nr-pages", ""],
-         ["aio-io-setup-with-nonwritable-context-pointer", ""],
-         ["aio-dio-extend-stat", "file"],
-         ["aio-cve-2016-10044", ""],
-         ]
-name = 0
-arglist = 1
-
-
 class aio_dio_bugs(test.test):
     version = 5
     preserve_srcdir = True
@@ -31,13 +19,11 @@ def setup(self):
         os.chdir(self.srcdir)
         utils.make('"CFLAGS=' + self.gcc_flags + '"')
 
-    def execute(self, args=''):
+    def run_once(self, test_name, args=''):
         os.chdir(self.tmpdir)
         libs = self.autodir + '/deps/libaio/lib/'
         ld_path = utils.prepend_path(libs,
                                      utils.environ('LD_LIBRARY_PATH'))
         var_ld_path = 'LD_LIBRARY_PATH=' + ld_path
-        for test in tests:
-            cmd = self.srcdir + '/' + test[name] + ' ' + args + ' ' \
-                + test[arglist]
-            utils.system(var_ld_path + ' ' + cmd)
+        cmd = self.srcdir + '/' + test_name + ' ' + args
+        utils.system(var_ld_path + ' ' + cmd)
diff --git a/aio_dio_bugs/control b/aio_dio_bugs/control
index 57d26d42c..eeaaf8614 100644
--- a/aio_dio_bugs/control
+++ b/aio_dio_bugs/control
@@ -15,5 +15,17 @@ The bug was fixed in the fs/direct-io.c completion reworking that appeared
 in 2.6.20.  This test should fail on 2.6.19.
 """
 
+# tests is a simple array of "cmd" "arguments"
+tests = [["aio-dio-invalidate-failure", "poo"],
+         ["aio-dio-subblock-eof-read", "eoftest"],
+         ["aio-free-ring-with-bogus-nr-pages", ""],
+         ["aio-io-setup-with-nonwritable-context-pointer", ""],
+         ["aio-dio-extend-stat", "file"],
+         ["aio-cve-2016-10044", ""],
+         ]
+name = 0
+arglist = 1
 
-job.run_test('aio_dio_bugs')
+
+for test in tests:
+    results = job.run_test('aio_dio_bugs', test_name=test[name], tag=test[name], args=test[arglist])