diff --git a/selftests/all/functional/avocado/output_check_tests.py b/selftests/all/functional/avocado/output_check_tests.py
new file mode 100644
index 0000000000000000000000000000000000000000..ecf29ad701f8acaf6ea7bcddadfba362cb145dfb
--- /dev/null
+++ b/selftests/all/functional/avocado/output_check_tests.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# See LICENSE for more details.
+#
+# Copyright: Red Hat Inc. 2013-2014
+# Author: Lucas Meneghel Rodrigues <lmr@redhat.com>
+
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+# simple magic for using scripts within a source tree
+basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..')
+basedir = os.path.abspath(basedir)
+if os.path.isdir(os.path.join(basedir, 'avocado')):
+    sys.path.append(basedir)
+
+from avocado.utils import process
+
+OUTPUT_SCRIPT_CONTENTS = """#!/bin/sh
+echo "Hello, avocado!"
+"""
+
+
+class RunnerDropinTest(unittest.TestCase):
+
+    def setUp(self):
+        self.base_logdir = tempfile.mkdtemp(prefix='avocado_output_check_functional')
+        self.output_script = os.path.join(self.base_logdir, 'output_check.sh')
+        with open(self.output_script, 'w') as output_script_obj:
+            output_script_obj.write(OUTPUT_SCRIPT_CONTENTS)
+        os.chmod(self.output_script, 0775)
+
+    def test_output_record_none(self):
+        os.chdir(basedir)
+        cmd_line = './scripts/avocado run %s --output-check-record none' % self.output_script
+        result = process.run(cmd_line, ignore_status=True)
+        expected_rc = 0
+        self.assertEqual(result.exit_status, expected_rc,
+                         "Avocado did not return rc %d:\n%s" %
+                         (expected_rc, result))
+        stdout_file = os.path.join("%s.data/stdout.expected" % self.output_script)
+        stderr_file = os.path.join("%s.data/stderr.expected" % self.output_script)
+        self.assertFalse(os.path.isfile(stdout_file))
+        self.assertFalse(os.path.isfile(stderr_file))
+
+    def test_output_record_stdout(self):
+        os.chdir(basedir)
+        cmd_line = './scripts/avocado run %s --output-check-record stdout' % self.output_script
+        result = process.run(cmd_line, ignore_status=True)
+        expected_rc = 0
+        self.assertEqual(result.exit_status, expected_rc,
+                         "Avocado did not return rc %d:\n%s" %
+                         (expected_rc, result))
+        stdout_file = os.path.join("%s.data/stdout.expected" % self.output_script)
+        stderr_file = os.path.join("%s.data/stderr.expected" % self.output_script)
+        self.assertTrue(os.path.isfile(stdout_file))
+        self.assertFalse(os.path.isfile(stderr_file))
+
+    def test_output_record_all(self):
+        os.chdir(basedir)
+        cmd_line = './scripts/avocado run %s --output-check-record all' % self.output_script
+        result = process.run(cmd_line, ignore_status=True)
+        expected_rc = 0
+        self.assertEqual(result.exit_status, expected_rc,
+                         "Avocado did not return rc %d:\n%s" %
+                         (expected_rc, result))
+        stdout_file = os.path.join("%s.data/stdout.expected" % self.output_script)
+        stderr_file = os.path.join("%s.data/stderr.expected" % self.output_script)
+        self.assertTrue(os.path.isfile(stdout_file))
+        self.assertTrue(os.path.isfile(stderr_file))
+
+    def test_output_record_and_check(self):
+        self.test_output_record_all()
+        cmd_line = './scripts/avocado run %s' % self.output_script
+        result = process.run(cmd_line, ignore_status=True)
+        expected_rc = 0
+        self.assertEqual(result.exit_status, expected_rc,
+                         "Avocado did not return rc %d:\n%s" %
+                         (expected_rc, result))
+
+    def test_output_tamper_stdout(self):
+        self.test_output_record_all()
+        tampered_msg = "I PITY THE FOOL THAT STANDS ON MY WAY!"
+        stdout_file = os.path.join("%s.data/stdout.expected" % self.output_script)
+        with open(stdout_file, 'w') as stdout_file_obj:
+            stdout_file_obj.write(tampered_msg)
+        cmd_line = './scripts/avocado run %s --xunit -' % self.output_script
+        result = process.run(cmd_line, ignore_status=True)
+        expected_rc = 1
+        self.assertEqual(result.exit_status, expected_rc,
+                         "Avocado did not return rc %d:\n%s" %
+                         (expected_rc, result))
+        self.assertIn(tampered_msg, result.stdout)
+
+    def test_disable_output_check(self):
+        self.test_output_record_all()
+        tampered_msg = "I PITY THE FOOL THAT STANDS ON MY WAY!"
+        stdout_file = os.path.join("%s.data/stdout.expected" % self.output_script)
+        with open(stdout_file, 'w') as stdout_file_obj:
+            stdout_file_obj.write(tampered_msg)
+        cmd_line = './scripts/avocado run %s --disable-output-check --xunit -' % self.output_script
+        result = process.run(cmd_line, ignore_status=True)
+        expected_rc = 0
+        self.assertEqual(result.exit_status, expected_rc,
+                         "Avocado did not return rc %d:\n%s" %
+                         (expected_rc, result))
+        self.assertNotIn(tampered_msg, result.stdout)
+
+    def tearDown(self):
+        if os.path.isdir(self.base_logdir):
+            shutil.rmtree(self.base_logdir, ignore_errors=True)
+
+if __name__ == '__main__':
+    unittest.main()