diff --git a/Makefile.am b/Makefile.am
index c9ee651..637f361 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src tests
+SUBDIRS = src
 
 #EXTRA_DIST = LEGAL acinclude.m4 include
 
diff --git a/configure.ac b/configure.ac
index d126788..48d7edc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ fi
 
 AC_CONFIG_FILES([Makefile
 		src/Makefile
-		tests/Makefile
 		ima-evm-utils.spec
 		])
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 9db2932..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-pkglibexec_PROGRAMS = openclose
-
-openclose_SOURCES = openclose.c
-
-dist_pkglibexec_SCRIPTS = evm_enable.sh evm_genkey.sh evm_sign_all.sh evm_sign_modules.sh \
-			ima_fix_dir.sh evm_hmac_all.sh evm_hmac_modules.sh
-
diff --git a/tests/evm_enable.sh b/tests/evm_enable.sh
deleted file mode 100755
index 97fa5e0..0000000
--- a/tests/evm_enable.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# import EVM HMAC key
-keyctl clear @u
-keyctl add user kmk "testing123" @u
-keyctl add encrypted evm-key "load `cat /etc/keys/evm-key`" @u
-
-# import Moule public key
-mod_id=`keyctl newring _module @u`
-evmctl import /etc/keys/pubkey_evm.pem $mod_id
-
-# import IMA public key
-ima_id=`keyctl newring _ima @u`
-evmctl import /etc/keys/pubkey_evm.pem $ima_id
-
-# import EVM public key
-evm_id=`keyctl newring _evm @u`
-evmctl import /etc/keys/pubkey_evm.pem $evm_id
-
-# enable EVM
-echo "1" > /sys/kernel/security/evm
-
-# enable module checking
-echo "1" > /sys/kernel/security/ima/module_check
-
diff --git a/tests/evm_genkey.sh b/tests/evm_genkey.sh
deleted file mode 100755
index 86355e0..0000000
--- a/tests/evm_genkey.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-keyctl add user kmk "testing123" @u
-key=`keyctl add encrypted evm-key "new user:kmk 32" @u`
-keyctl print $key >/etc/keys/evm-key
-
-keyctl list @u
-
diff --git a/tests/evm_hmac_all.sh b/tests/evm_hmac_all.sh
deleted file mode 100755
index fc5b9e9..0000000
--- a/tests/evm_hmac_all.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-verbose=""
-if [ "$1" = "-v" ] ; then
-	verbose="-v"
-	shift 1
-fi
-
-dir=${1:-/}
-
-echo "Label: $dir"
-
-find $dir \( -fstype rootfs -o -fstype ext3 -o -fstype ext4 \) \( -type f -o -type d \) -exec evmctl hmac --imahash $verbose '{}' \;
-
diff --git a/tests/evm_hmac_modules.sh b/tests/evm_hmac_modules.sh
deleted file mode 100755
index edcc388..0000000
--- a/tests/evm_hmac_modules.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-verbose=""
-if [ "$1" = "-v" ] ; then
-	verbose="-v"
-	shift 1
-fi
-
-dir=${1:-/lib/modules}
-
-echo "HMAC modules: $dir"
-
-find $dir -name "*.ko" -type f -exec evmctl hmac --imasig $verbose '{}' \;
-
diff --git a/tests/evm_sign_all.sh b/tests/evm_sign_all.sh
deleted file mode 100755
index 72268cd..0000000
--- a/tests/evm_sign_all.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-verbose=""
-if [ "$1" = "-v" ] ; then
-	verbose="-v"
-	shift 1
-fi
-
-dir=${1:-/}
-
-echo "Label: $dir"
-
-find $dir \( -fstype rootfs -o -fstype ext3 -o -fstype ext4 \) -type f -exec evmctl sign --imahash $verbose '{}' \;
-
diff --git a/tests/evm_sign_modules.sh b/tests/evm_sign_modules.sh
deleted file mode 100755
index 97da501..0000000
--- a/tests/evm_sign_modules.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-verbose=""
-if [ "$1" = "-v" ] ; then
-	verbose="-v"
-	shift 1
-fi
-
-dir=${1:-/lib/modules}
-
-echo "Signing modules: $dir"
-
-find $dir -name "*.ko" -type f -exec evmctl sign --imasig $verbose '{}' \;
-
diff --git a/tests/ima_fix_dir.sh b/tests/ima_fix_dir.sh
deleted file mode 100755
index 96f478d..0000000
--- a/tests/ima_fix_dir.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-dir=${1:-/}
-
-echo "Fixing dir: $dir"
-
-find $dir \( -fstype rootfs -o -fstype ext3 -o -fstype ext4 \) -type f -exec openclose '{}' \;
-
diff --git a/tests/openclose.c b/tests/openclose.c
deleted file mode 100644
index fd37a2b..0000000
--- a/tests/openclose.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <stdlib.h>
-
-int main(int argc, char *argv[])
-{
-	int fd;
-
-	fd = open(argv[1], O_RDONLY);
-	if (fd < 0) {
-		perror("open()");
-		exit(1);
-	}
-
-	close(fd);
-
-	return 0;
-}
-