diff --git a/src/warden-server/doc/warden21to22.patch b/src/warden-server/doc/warden21to22.patch
index 2278f44379438fa88f593ab8f8a7aa3ea6fa9dd0..1abce17ec5706aa4c965f7872ab5915cbe1610ec 100644
--- a/src/warden-server/doc/warden21to22.patch
+++ b/src/warden-server/doc/warden21to22.patch
@@ -1,18 +1,22 @@
-ALTER TABLE `clients`
-ADD `valid` varchar(1) DEFAULT 't';
+ALTER TABLE clients_test
+ADD valid varchar(1) DEFAULT 't';
 
-ALTER TABLE `events`
-ADD `client_id` int(11) DEFAULT NULL;
+ALTER TABLE events_test
+ADD client_id int(11) DEFAULT NULL;
 
-UPDATE `events`, `clients`
-SET events.client_id = clients.client_id
-WHERE `events.hostname` = `clients.hostname` AND `events.service` = `clients.service`;
+UPDATE events_test e, clients_test c
+SET e.client_id = c.client_id
+WHERE e.hostname = c.hostname AND e.service = c.service;
 
-ALTER TABLE `events`
-DROP COLUMN `hostname`,
-DROP COLUMN `service`;
+ALTER TABLE events_test
+DROP COLUMN hostname,
+DROP COLUMN service;
 
-ALTER TABLE `events`
-ADD INDEX `idx_events_type_valid` (`type`,`valid`),
-ADD INDEX `idx_events_client_id` (`client_id`),
-ADD INDEX `idx_events_detected` (`detected`);
+UPDATE events_test
+SET valid = 'o'
+WHERE client_id is NULL;
+
+ALTER TABLE events_test
+ADD INDEX idx_events_test_type_valid (type,valid),
+ADD INDEX idx_events_test_client_id (client_id),
+ADD INDEX idx_events_test_detected (detected);