diff --git a/devices/tests/test_device_form_views.py b/devices/tests/test_device_form_views.py
index 383b730..307e96a 100644
--- a/devices/tests/test_device_form_views.py
+++ b/devices/tests/test_device_form_views.py
@@ -4,6 +4,8 @@ from django.test import Client
 from mixer.backend.django import mixer
 import pytest
 
+from core.tests import helper
+
 
 pytestmark = pytest.mark.django_db
 
@@ -51,6 +53,31 @@ def test_device_update_view(create_admin_user):
     assert device.name == data['name']
 
 
+def test_device_update_view_wrong_name(create_admin_user):
+    create_admin_user()
+    client = Client()
+    client.login(username="pharma-admin", password="password")
+    device1 = mixer.blend('devices.Device', customer=mixer.SELECT)
+    device2 = mixer.blend('devices.Device', customer=mixer.SELECT)
+    data = {'name': device2.name,
+            'description': '',
+            'serialnumber': '',
+            'category': '',
+            'owner': '',
+            'customer': device1.customer.id,
+            'manufacturer': '',
+            'model': '',
+            'location': '',
+            'user': '',
+            'installation_date': '',
+            'save_device': ""}
+    response = client.post('/update/device/{}/'.format(device1.pk), data)
+    assert (response.status_code == 200
+            and helper.in_content(
+                response,
+                "Device with this Name and Customer already exists."))
+
+
 def test_warranty_create_view(create_admin_user):
     create_admin_user()
     client = Client()