diff --git a/configure.ac b/configure.ac
index 7c33c6257..d113ada59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,14 +181,15 @@ AC_ARG_ENABLE(pip,
 	[AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])])
 
 
-AC_ARG_ENABLE(testmenu,
-       AS_HELP_STRING(--enable-testmenu,include test menu in neutrino main menu))
+AC_ARG_ENABLE(testing,
+       AS_HELP_STRING(--enable-testing,include devel code parts for neutrino tests))
 
-AM_CONDITIONAL(ENABLE_TEST_MENU,test "$enable_testmenu" = "yes")
-if test "$enable_testmenu" = "yes"; then
-	AC_DEFINE(ENABLE_TEST_MENU,1,[include test menu in neutrino main menu - not recommended for general users!])
+AM_CONDITIONAL(ENABLE_TESTING,test "$enable_testing" = "yes")
+if test "$enable_testing" = "yes"; then
+	AC_DEFINE(ENABLE_TESTING,1,[include devel code parts for neutrino tests - not recommended for general users!])
 fi
 
+
 if test "$BOXTYPE" = "coolstream"; then
 if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 689902fc3..8b78680cd 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -117,7 +117,7 @@ libneutrino_gui_a_SOURCES = \
 	webtv_setup.cpp \
 	zapit_setup.cpp
 
-if ENABLE_TEST_MENU
+if ENABLE_TESTING
 libneutrino_gui_a_SOURCES += \
 	test_menu.cpp
 endif
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 8c7138a88..df556211d 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -71,7 +71,7 @@
 #include "gui/sleeptimer.h"
 #include "gui/update_menue.h"
 #include "gui/streaminfo2.h"
-#ifdef ENABLE_TEST_MENU
+#ifdef ENABLE_TESTING
 #include "gui/test_menu.h"
 #endif
 #include "gui/update.h"
@@ -301,7 +301,7 @@ void CNeutrinoApp::InitMenuMain()
 		}
 	}
 
-#ifdef ENABLE_TEST_MENU
+#ifdef ENABLE_TESTING
 	personalize.addItem(MENU_MAIN, new CMenuForwarder("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
 #endif
 }