diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index cf005998c1..f3cecf0e2c 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-12  Sancho Lerena <slerena@artica.es>
+
+	* util/pandora_xml_stress.agents
+	util/pandora_xml_stress.conf: Added default file for agent
+	dictionary. Better defaults on modules. Ready to be used for
+	testing Pandora FMS servers.
+
 2012-03-08  Koichiro Kikuchi <koichiro@rworks.jp>
 
 	* util/pandora_db.pl: Fixed wrong SQL of my previous commit.
diff --git a/pandora_server/util/pandora_xml_stress.agents b/pandora_server/util/pandora_xml_stress.agents
new file mode 100644
index 0000000000..26ec660d38
--- /dev/null
+++ b/pandora_server/util/pandora_xml_stress.agents
@@ -0,0 +1,7 @@
+Router de Acceso a Internet
+Firewall perimetral de la Zona B
+Base de datos orientada a ruido
+prometeo.internal.zonebeta.com
+hades.external.zonebeta.com
+pikachu.zonebeta.com
+house.zonebeta.com
diff --git a/pandora_server/util/pandora_xml_stress.conf b/pandora_server/util/pandora_xml_stress.conf
index 5535594b2f..7292d80b76 100644
--- a/pandora_server/util/pandora_xml_stress.conf
+++ b/pandora_server/util/pandora_xml_stress.conf
@@ -6,7 +6,7 @@
 max_threads 5
 
 # File containing a list of agent names (one per line).
-agent_file /tmp/agent_names.txt
+agent_file pandora_xml_stress.agents
 
 # Directory where XML data files will be placed, by default /tmp.
 # When sending files to a local Tentacle server make sure this directory
@@ -29,13 +29,13 @@ os_name Linux
 os_version 2.6
 
 # Agent interval, by default 300.
-agent_interval 300
+agent_interval 900
 
 # Data file generation start date, by default now.
-time_from 2012-03-01 00:00:00
+#time_from 2012-03-01 00:00:00
 
 # Data file generation end date, by default now.
-time_to 2012-03-08 00:00:00
+#time_to 2012-04-01 00:00:00
 
 # Get conf from Pandora Server
 get_and_send_agent_conf 0
@@ -84,11 +84,19 @@ module_exec type=RANDOM;variation=20;min=50;max=500
 module_unit conns
 module_end
 
+module_begin
+module_name Dropped Bits of nothing
+module_type generic_data
+module_description Simulation of big number with absolute nosense, real like life itself.
+module_exec type=RANDOM;variation=5;min=-5000;max=500000000
+module_unit gamusins
+module_end
+
 module_begin
 module_name Network Traffic (Incoming)
 module_type generic_data
 module_description Network throughtput for incoming data
-module_exec type=RANDOM;variation=50;min=0;max=100000
+module_exec type=RANDOM;variation=50;min=0;max=1000000
 module_unit kbit/sec
 module_end
 
@@ -96,7 +104,7 @@ module_begin
 module_name Network Traffic (Outgoing)
 module_type generic_data
 module_description Network throughtput for Outgoing data
-module_exec type=RANDOM;variation=50;min=0;max=100000
+module_exec type=RANDOM;variation=50;min=0;max=1000000
 module_unit kbit/sec
 module_end