 				resin.models.application.create('TestApp', 'raspberry-pi').then (application) =>
 					@application = application
 
-					uuid = '1234567aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+					# Preceeding 1 is so that this can't start with a 0, so we get reversible parsing later
+					@shortUuid = '1' + Date.now().toString().slice(-6)
+					uuid = @shortUuid + resin.models.device.generateUniqueKey().slice(7)
 					resin.models.device.register(application.app_name, uuid)
 				.then (deviceInfo) =>
 					@deviceInfo = deviceInfo

				resin.models.application.create('FooBar', 'raspberry-pi').then (application) =>
					@application = application

					uuid1 = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
					uuid2 = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'

					Promise.all [
						resin.models.device.register(application.app_name, uuid1)

				describe 'resin.models.device.get()', ->

					it 'should be rejected with an error if there is an ambiguation between shorter uuids', ->
						promise = resin.models.device.get(@uuidRoot)

						m.chai.expect(promise).to.be.rejected
							.and.eventually.have.property('code', 'ResinAmbiguousDevice')
