diff --git a/.gitignore b/.gitignore
index 499e9c4d90..db03272a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 *.o
 *.a
-ccdv
-udev
 udevd
 udevcontrol
 udevtrigger
@@ -12,4 +10,5 @@ udevmonitor
 udevstart
 udevtest
 udev_version.h
+test-udev
 
diff --git a/Makefile b/Makefile
index b3a5005757..990f00f319 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,6 @@ EXTRAS =
 V =
 
 PROGRAMS = \
-	udev				\
 	udevd				\
 	udevtrigger			\
 	udevsettle			\
@@ -51,6 +50,7 @@ PROGRAMS = \
 	udevmonitor			\
 	udevinfo			\
 	udevtest			\
+	test-udev			\
 	udevstart
 
 HEADERS = \
diff --git a/udev.c b/test-udev.c
similarity index 100%
rename from udev.c
rename to test-udev.c
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 54c3378392..73d99297d2 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -22,7 +22,7 @@ use strict;
 
 my $PWD		= $ENV{PWD};
 my $sysfs	= "sys/";
-my $udev_bin	= "../udev";
+my $udev_bin	= "../test-udev";
 my $udev_root	= "udev-root/"; # !!! directory will be removed !!!
 my $udev_conf	= "udev-test.conf";
 my $udev_rules	= "udev-test.rules";