diff --git a/Core/Locks/Test/Fixture/GlobalLockFixture.php b/Core/Locks/Test/Fixture/GlobalLockFixture.php
deleted file mode 100644
index 6dfb5409a..000000000
--- a/Core/Locks/Test/Fixture/GlobalLockFixture.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-	class GlobalLockFixture extends CakeTestFixture {
-		public $name = 'GlobalLock';
-
-			public $fields = array(
-				'id' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 36, 'key' => 'primary', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-				'class' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 128, 'key' => 'index', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-				'foreign_key' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 36, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-				'user_id' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 36, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-				'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-				'indexes' => array(
-					'PRIMARY' => array('column' => 'id', 'unique' => 1),
-					'lock' => array('column' => array('class', 'foreign_key'), 'unique' => 1)
-				),
-				'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
-			);
-
-			public $records = array(
-				array(
-					'id' => 'lock-1',
-					'class' => 'Blog.Post',
-					'foreign_key' => 'post-1',
-					'user_id' => '1',
-					'created' => '2012-06-21 16:44:36'
-				),
-			);
-		}
\ No newline at end of file
diff --git a/Core/Locks/Test/Fixture/LockFixture.php b/Core/Locks/Test/Fixture/LockFixture.php
index 9336f9820..7c6321150 100644
--- a/Core/Locks/Test/Fixture/LockFixture.php
+++ b/Core/Locks/Test/Fixture/LockFixture.php
@@ -8,6 +8,8 @@
 class LockFixture extends CakeTestFixture {
 	public $name = 'Lock';
 
+	public $table = 'global_locks';
+
 	public $fields = array(
 		'id' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 36, 'key' => 'primary', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
 		'class' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 128, 'key' => 'index', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
@@ -22,5 +24,12 @@ class LockFixture extends CakeTestFixture {
 	);
 
 	public $records = array(
+		array(
+			'id' => 'lock-1',
+			'class' => 'Blog.Post',
+			'foreign_key' => 'post-1',
+			'user_id' => '1',
+			'created' => '2012-06-21 16:44:36'
+		),
 	);
 }
\ No newline at end of file
diff --git a/Plugin/Gallery b/Plugin/Gallery
index 9095ced42..887525136 160000
--- a/Plugin/Gallery
+++ b/Plugin/Gallery
@@ -1 +1 @@
-Subproject commit 9095ced4257078edd5adb5a0083b5b94f58e8cf5
+Subproject commit 887525136fa0d758e058ae3bd76fd864b66ce0b7