diff --git a/fisdir.c b/fisdir.c
index 8f8a28c..7b0deda 100644
--- a/fisdir.c
+++ b/fisdir.c
@@ -21,7 +21,6 @@
  * THE SOFTWARE.
  */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -42,37 +41,8 @@ int fisdir(const char *file)
 	return 0;
 }
 
-#ifdef UNITTEST
-#include "lite.h"
-
-int main(void)
-{
-	int i = 0;
-	struct { char *file; int exist; } arr[] = {
-		{ "/etc/passwd", 0 },
-		{ "/etc/",       1 },
-		{ "/sbin/init",  0 },
-		{ "/dev/null",   0 },
-		{ "/dev/",       1 },
-		{ NULL,  0 },
-	};
-	FILE *src, *dst;
-
-	for (i = 0; i < NELEMS(arr); i++) {
-		if (fisdir(arr[i].file) != arr[i].exist)
-			err(1, "Failed fisdir(%s)", arr[i].file ?: "NULL");
-		else
-			printf("fisdir() %-11s %-18s => OK!\n", arr[i].file ?: "NULL",
-			       arr[i].exist ? "is a directory" : "is NOT a directory");
-	}
-
-	return 0;
-}
-#endif /* UNITTEST */
-
 /**
  * Local Variables:
- *  compile-command: "make V=1 -f fisdir.mk"
  *  indent-tabs-mode: t
  *  c-file-style: "linux"
  * End:
diff --git a/fisdir.mk b/fisdir.mk
deleted file mode 100644
index 32d486d..0000000
--- a/fisdir.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-OBJS        = 
-TARGET      = fisdir.test clean
-
-include rules.mk
diff --git a/tests/.gitignore b/tests/.gitignore
index ac26258..1ab0c84 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,5 +1,6 @@
 *.log
 *.trs
+fisdir
 fsendfile
 lfile
 makepath
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e804c68..6e39b31 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,7 @@ EXTRA_DIST      = check.h
 CLEANFILES      = *~ *.trs *.log
 
 TESTS           =
+TESTS          += fisdir
 TESTS          += fsendfile
 TESTS          += lfile
 TESTS          += makepath
diff --git a/tests/fisdir.c b/tests/fisdir.c
new file mode 100644
index 0000000..307aed6
--- /dev/null
+++ b/tests/fisdir.c
@@ -0,0 +1,24 @@
+#include "check.h"
+
+int main(void)
+{
+	size_t i = 0;
+	struct { char *file; int exist; } arr[] = {
+		{ "/etc/passwd", 0 },
+		{ "/etc/",       1 },
+		{ "/sbin/init",  0 },
+		{ "/dev/null",   0 },
+		{ "/dev/",       1 },
+		{ NULL,  0 },
+	};
+
+	for (i = 0; i < NELEMS(arr); i++) {
+		if (fisdir(arr[i].file) != arr[i].exist)
+			err(1, "Failed fisdir(%s)", arr[i].file ?: "NULL");
+		else
+			printf("fisdir() %-11s %-18s => OK!\n", arr[i].file ?: "NULL",
+			       arr[i].exist ? "is a directory" : "is NOT a directory");
+	}
+
+	return 0;
+}