diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c
index 569170815..9f169bcf9 100644
--- a/src/filemanager/cmd.c
+++ b/src/filemanager/cmd.c
@@ -790,6 +790,8 @@ do_edit_at_line (const vfs_path_t * what_vpath, gboolean internal, long start_li
     else
 #endif /* USE_INTERNAL_EDIT */
     {
+        (void) internal;
+
         if (editor == NULL)
         {
             editor = getenv ("EDITOR");
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 92b045c30..f3698a9f8 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = . editor filemanager
+SUBDIRS = . filemanager
+
+if USE_EDIT
+SUBDIRS += editor
+endif
 
 AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \