diff --git a/migrations/201606280001_devices_idx_uuid_sn_down.sql b/migrations/201606280001_devices_idx_uuid_sn_down.sql
new file mode 100644
index 00000000..2ca9de23
--- /dev/null
+++ b/migrations/201606280001_devices_idx_uuid_sn_down.sql
@@ -0,0 +1,4 @@
+DROP INDEX IF EXISTS serial_idx;
+DROP INDEX IF EXISTS udid_idx;
+
+CREATE UNIQUE INDEX IF NOT EXISTS udid_serial_idx ON devices (udid, serial_number);
\ No newline at end of file
diff --git a/migrations/201606280001_devices_idx_uuid_sn_up.sql b/migrations/201606280001_devices_idx_uuid_sn_up.sql
new file mode 100644
index 00000000..84f58f9c
--- /dev/null
+++ b/migrations/201606280001_devices_idx_uuid_sn_up.sql
@@ -0,0 +1,5 @@
+-- Add the UUID and Serial Number back as individual UNIQUE constraints, along with others
+DROP INDEX udid_serial_idx;
+
+CREATE UNIQUE INDEX IF NOT EXISTS serial_idx ON devices (serial_number);
+CREATE UNIQUE INDEX IF NOT EXISTS udid_idx ON devices (udid);