diff --git a/cnee/src/Makefile.am b/cnee/src/Makefile.am
index 5bdd8c7..7bcc469 100644
--- a/cnee/src/Makefile.am
+++ b/cnee/src/Makefile.am
@@ -91,9 +91,9 @@ man: ./$(CNEE)$(EXEEXT)
 	@echo "Generating man page file from: $(CNEE)$(EXEEXT)"
 	./$(CNEE)$(EXEEXT) --manpage > cnee.1
 	@echo "Generating texi file from: $(CNEE)$(EXEEXT)"
-	./$(CNEE)$(EXEEXT) --texipage > cnee.texinfo
-	@echo "Generating info file from cnee.texinfo"
-	$(MAKEINFO) cnee.texinfo
+	./$(CNEE)$(EXEEXT) --texipage > cnee.texi
+	@echo "Generating info file from cnee.texi"
+	$(MAKEINFO) cnee.texi
 
 
 cnee.1: $(CNEE)$(EXEEXT)
diff --git a/tests/e2e_cnee.sh b/tests/e2e_cnee.sh
index ee061d1..7637666 100755
--- a/tests/e2e_cnee.sh
+++ b/tests/e2e_cnee.sh
@@ -111,11 +111,11 @@ echo ""
 echo "=== Group 1: Binary basics ==="
 
 assert_exit_zero "cnee --version exits 0" "$CNEE" --version
-assert_output_contains "cnee --version prints 'xnee'" "xnee" "$CNEE" --version
+assert_output_contains "cnee --version prints 'xnee'" "Xnee\|xnee" "$CNEE" --version
 assert_output_contains "cnee --version prints a version number" "[0-9]\.[0-9]" "$CNEE" --version
 
 assert_exit_zero "cnee -V (short) exits 0" "$CNEE" -V
-assert_output_contains "cnee -V prints same output as --version" "xnee" "$CNEE" -V
+assert_output_contains "cnee -V prints same output as --version" "Xnee\|xnee" "$CNEE" -V
 
 assert_exit_zero "cnee --help exits 0" "$CNEE" --help
 assert_output_contains "cnee --help prints USAGE line" "USAGE" "$CNEE" --help