diff --git a/scripts/test-template.php b/scripts/test-template.php
index 743f785bf6..3781949ecb 100755
--- a/scripts/test-template.php
+++ b/scripts/test-template.php
@@ -4,7 +4,7 @@
 $init_modules = array('alerts');
 require __DIR__ . '/../includes/init.php';
 
-$options = getopt('t:h:r:p:d::');
+$options = getopt('t:h:r:p:s:d::');
 
 if ($options['t'] && $options['h'] && $options['r']) {
     if (isset($options['d'])) {
@@ -17,8 +17,12 @@ if ($options['t'] && $options['h'] && $options['r']) {
     $template_id = $options['t'];
     $device_id = ctype_digit($options['h']) ? $options['h'] : getidbyname($options['h']);
     $rule_id = $options['r'];
-
-    $alert = dbFetchRow('SELECT alert_log.id,alert_log.rule_id,alert_log.device_id,alert_log.state,alert_log.details,alert_log.time_logged,alert_rules.rule,alert_rules.severity,alert_rules.extra,alert_rules.name FROM alert_log,alert_rules WHERE alert_log.rule_id = alert_rules.id && alert_log.device_id = ? && alert_log.rule_id = ? && alert_rules.disabled = 0 ORDER BY alert_log.id DESC LIMIT 1', array($device_id, $rule_id));
+    if (isset($options['s'])) {
+        $alert = dbFetchRow('SELECT alert_log.id,alert_log.rule_id,alert_log.device_id,alert_log.state,alert_log.details,alert_log.time_logged,alert_rules.rule,alert_rules.severity,alert_rules.extra,alert_rules.name FROM alert_log,alert_rules WHERE alert_log.rule_id = alert_rules.id && alert_log.device_id = ? && alert_log.rule_id = ? && alert_rules.disabled = 0 && alert_log.state=? ORDER BY alert_log.id DESC LIMIT 1', array($device_id, $rule_id, intval($options['s'])));
+    }
+    if (!isset($alert)) {
+        $alert = dbFetchRow('SELECT alert_log.id,alert_log.rule_id,alert_log.device_id,alert_log.state,alert_log.details,alert_log.time_logged,alert_rules.rule,alert_rules.severity,alert_rules.extra,alert_rules.name FROM alert_log,alert_rules WHERE alert_log.rule_id = alert_rules.id && alert_log.device_id = ? && alert_log.rule_id = ? && alert_rules.disabled = 0 ORDER BY alert_log.id DESC LIMIT 1', array($device_id, $rule_id));
+    }
     $alert['details'] = json_decode(gzuncompress($alert['details']), true);
     $obj = DescribeAlert($alert);
     $obj['template'] = dbFetchCell('SELECT `template` FROM `alert_templates` WHERE `id`=?', array($template_id));
@@ -35,6 +39,8 @@ Usage:
     -h Is the device ID or hostname
     -r Is the rule ID
     -p Is the transport name (optional)
+    -s Is the alert state <0|1|2|3|4> (optional - defaults to current state.)
+       0 = ok, 1 = alert, 2 = acknowledged, 3 = got worse, 4 = got better
     -d Debug
     
 Example: