diff --git a/Makefile b/Makefile
index dd23c4d5b..589de7864 100644
--- a/Makefile
+++ b/Makefile
@@ -261,6 +261,9 @@ portal:		portal_conf common
 manager:	manager_conf handler
 	$(MAKE) -C ${SRCMANAGERDIR}
 
+################
+# Test targets #
+################
 test:		all common_test handler_test portal_test manager_test extra_test
 
 common_test:	common
@@ -279,6 +282,7 @@ extra_test:	all
 	cd ${SRCPORTALDIR} && prove -b -I ../$(SRCCOMMONDIR)/blib/lib -I ../$(SRCHANDLERDIR)/blib/lib -I../${SRCPORTALDIR}/blib/lib/ xt
 #	PERL_DL_NONLAZY=1 $(PERL) "-MExtUtils::Command::MM" "-e" "test_harness(0, 'lemonldap-ng-common/blib/lib', 'lemonldap-ng-handler/blib/lib', 'lemonldap-ng-manager/blib/lib', 'lemonldap-ng-portal/blib/lib')" extra-tests/*.t
 
+# End-to-end tests
 e2e_test:	all prepare_test_server start_web_server launch_protractor stop_web_server
 
 prepare_test_server:
@@ -324,6 +328,18 @@ stop_web_server:
 
 restart_web_server: start_web_server
 
+# Nginx tests
+start_nginx:	all prepare_test_server
+	@$(NGINX) -p `pwd`/e2e-tests \
+		-g 'error_log /home/xavier/dev/lemonldap/e2e-tests/conf/nginx.log;' \
+		-c `pwd`/e2e-tests/nginx.conf
+
+stop_nginx:
+	# Stop web server
+	@kill `cat e2e-tests/conf/nginx.pid`
+	# Clean
+	@rm -rf e2e-tests/conf
+
 #
 # INSTALL
 #
diff --git a/e2e-tests/nginx.conf b/e2e-tests/nginx.conf
new file mode 100644
index 000000000..82e11d9e9
--- /dev/null
+++ b/e2e-tests/nginx.conf
@@ -0,0 +1,21 @@
+worker_processes auto;
+pid conf/nginx.pid;
+
+events {
+	worker_connections 768;
+	# multi_accept on;
+}
+
+http {
+	sendfile on;
+	tcp_nopush on;
+	tcp_nodelay on;
+	keepalive_timeout 65;
+	types_hash_max_size 2048;
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+	access_log conf/nginx.log;
+	error_log  conf/nginx.log;
+	gzip off;
+	include conf/nginx*.conf;
+}