diff --git a/Makefile.in b/Makefile.in
index 916f54d4a..746be15be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -210,9 +210,7 @@ endif
 
 endif
 
-ifeq ("$(TESTING)", "yes")
 include test/unit/Makefile
-endif
 
 ifneq ($(shell which ctags),)
 .PHONY: tags
diff --git a/WHATS_NEW b/WHATS_NEW
index 205a963f3..fbe24180d 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.178 - 
 =====================================
+  --enable-testing switch for ./configure has been removed.
   --with-snapshots switch for ./configure has been removed.
   --with-mirrors switch for ./configure has been removed.
   --with-raid switch for ./configure has been removed.
diff --git a/configure b/configure
index dc372c38d..f2e946e1d 100755
--- a/configure
+++ b/configure
@@ -653,7 +653,6 @@ UDEV_RULES
 UDEV_PC
 THIN
 TESTSUITE_DATA
-TESTING
 STATIC_LINK
 STATICDIR
 SNAPSHOTS
@@ -950,7 +949,6 @@ with_cmirrord_pidfile
 enable_debug
 with_optimisation
 enable_profiling
-enable_testing
 enable_valgrind_pool
 enable_devmapper
 enable_lvmetad
@@ -1697,7 +1695,6 @@ Optional Features:
   --enable-cmirrord       enable the cluster mirror log daemon
   --enable-debug          enable debugging
   --enable-profiling      gather gcov profiling data
-  --enable-testing        enable testing targets in the makefile
   --enable-valgrind-pool  enable valgrind awareness of pools
   --disable-devmapper     disable LVM2 device-mapper interaction
   --enable-lvmetad        enable the LVM Metadata Daemon
@@ -11597,19 +11594,6 @@ $as_echo "$as_me: WARNING: GD.pm perl module is not installed" >&2;}
   fi
 fi
 
-################################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable unit testing" >&5
-$as_echo_n "checking whether to enable unit testing... " >&6; }
-# Check whether --enable-testing was given.
-if test "${enable_testing+set}" = set; then :
-  enableval=$enable_testing; TESTING=$enableval
-else
-  TESTING=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TESTING" >&5
-$as_echo "$TESTING" >&6; }
-
 ################################################################################
 TESTSUITE_DATA='${datarootdir}/lvm2-testsuite'
 # double eval needed ${datarootdir} -> ${prefix}/share -> real path
@@ -15685,7 +15669,6 @@ _ACEOF
 
 
 
-
 
 
 ################################################################################
diff --git a/configure.ac b/configure.ac
index edc40c7c5..69b97e0dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1067,15 +1067,6 @@ if test "$PROFILING" = yes; then
   fi
 fi
 
-################################################################################
-dnl -- Enable testing
-AC_MSG_CHECKING(whether to enable unit testing)
-AC_ARG_ENABLE(testing,
-	      AC_HELP_STRING([--enable-testing],
-			     [enable testing targets in the makefile]),
-	      TESTING=$enableval, TESTING=no)
-AC_MSG_RESULT($TESTING)
-
 ################################################################################
 dnl -- Set LVM2 testsuite data
 TESTSUITE_DATA='${datarootdir}/lvm2-testsuite'
@@ -2123,7 +2114,6 @@ AC_SUBST(SYSTEMD_LIBS)
 AC_SUBST(SNAPSHOTS)
 AC_SUBST(STATICDIR)
 AC_SUBST(STATIC_LINK)
-AC_SUBST(TESTING)
 AC_SUBST(TESTSUITE_DATA)
 AC_SUBST(THIN)
 AC_SUBST(THIN_CHECK_CMD)
diff --git a/make.tmpl.in b/make.tmpl.in
index 76e076a36..5c124b442 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -81,7 +81,6 @@ BLKID_CFLAGS = @BLKID_CFLAGS@
 BLKID_LIBS = @BLKID_LIBS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-TESTING = @TESTING@
 
 # Setup directory variables
 prefix = @prefix@