diff --git a/integration-tests/templates/datastore_server1/etc/datastore_server.conf b/integration-tests/templates/datastore_server1/etc/datastore_server.conf
index dcd43f961b727db73e306ce4b3f804ff5ba1dc0d..68a2dbd5cf509e092d01d0bb077a3fd89f22b018 100644
--- a/integration-tests/templates/datastore_server1/etc/datastore_server.conf
+++ b/integration-tests/templates/datastore_server1/etc/datastore_server.conf
@@ -11,6 +11,8 @@
 # Options to the JRE
 #
 JAVA_OPTS=${JAVA_OPTS:=-server}
+# Enable debugging if needed
+#JAVA_OPTS=${JAVA_OPTS:=-server -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8101}
 
 #
 # Maximal number of log files to keep
diff --git a/integration-tests/templates/datastore_server2/etc/datastore_server.conf b/integration-tests/templates/datastore_server2/etc/datastore_server.conf
index dcd43f961b727db73e306ce4b3f804ff5ba1dc0d..084b148136a36e65a8b36e2e45e3f802cee109e8 100644
--- a/integration-tests/templates/datastore_server2/etc/datastore_server.conf
+++ b/integration-tests/templates/datastore_server2/etc/datastore_server.conf
@@ -10,7 +10,9 @@
 #
 # Options to the JRE
 #
-JAVA_OPTS=${JAVA_OPTS:=-server}
+JAVA_OPTS=${JAVA_OPTS:=-server -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8102}
+# Enable debugging if needed
+#JAVA_OPTS=${JAVA_OPTS:=-server -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8101}
 
 #
 # Maximal number of log files to keep