diff --git a/tests/trinity/deps/trinity-1.4.tar.bz2 b/tests/trinity/deps/trinity-1.4.tar.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..7566757c01afb98952009d5305c2ad56d1164541
Binary files /dev/null and b/tests/trinity/deps/trinity-1.4.tar.bz2 differ
diff --git a/tests/trinity/trinity.py b/tests/trinity/trinity.py
new file mode 100644
index 0000000000000000000000000000000000000000..c2208f454146d911164be3aa6c33bf2308784229
--- /dev/null
+++ b/tests/trinity/trinity.py
@@ -0,0 +1,92 @@
+#!/usr/bin/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 random
+import tempfile
+
+from avocado import test
+from avocado import job
+from avocado.utils import archive
+from avocado.utils import build
+from avocado.utils import process
+from avocado.utils import crypto
+
+
+class trinity(test.Test):
+
+    """
+    Trinity syscall fuzzer wrapper.
+
+    :see: http://codemonkey.org.uk/projects/trinity/
+    :src: http://codemonkey.org.uk/projects/trinity/trinity-1.4.tar.xz (repackaged)
+
+    :param tarball: Path to the trinity tarball relative to deps dir.
+    :param stress: Name of the syscall you want to stress.
+    :param victims_path: Path to victim files
+    """
+    default_params = {'tarball': 'trinity-1.4.tar.bz2',
+                      'victims_path': None,
+                      'stress': None}
+
+    def populate_dir(self):
+        self.victims_path = tempfile.mkdtemp(prefix='trinity-victims',
+                                             dir=self.workdir)
+        sys_random = random.SystemRandom()
+        n_files = sys_random.randint(100, 150)
+        for _ in xrange(n_files):
+            fd, _ = tempfile.mkstemp(dir=self.victims_path, text=True)
+            str_length = sys_random.randint(30, 50)
+            n_lines = sys_random.randint(5, 7)
+            for _ in xrange(n_lines):
+                os.write(fd, crypto.get_random_string(str_length))
+            os.close(fd)
+
+    def setup(self):
+        """
+        Build trinity.
+        """
+        self.cwd = os.getcwd()
+        tarball_path = self.get_deps_path(self.params.tarball)
+        archive.extract(tarball_path, self.srcdir)
+        self.srcdir = os.path.join(self.srcdir, 'trinity-1.4')
+        os.chdir(self.srcdir)
+        process.run('chmod +x configure.sh')
+        process.run('./configure.sh')
+        build.make(self.srcdir)
+        self.populate_dir()
+
+    def action(self):
+        """
+        Execute the trinity syscall fuzzer with the appropriate params.
+        """
+        os.chdir(self.srcdir)
+        cmd = './trinity -I'
+        process.run(cmd)
+        cmd = './trinity'
+        if self.params.stress:
+            cmd += " " + self.params.stress
+        if self.params.victims_path:
+            cmd += " -V " + self.params.victims_path
+        else:
+            cmd += " -V " + self.victims_path
+        cmd_result = process.run(cmd)
+        self.log.info(cmd_result)
+        os.chdir(self.cwd)
+
+
+if __name__ == "__main__":
+    job.main()