diff --git a/novaclient/tests/unit/v2/test_server_groups.py b/novaclient/tests/unit/v2/test_server_groups.py
index 4ca002df8..f942d4b0b 100644
--- a/novaclient/tests/unit/v2/test_server_groups.py
+++ b/novaclient/tests/unit/v2/test_server_groups.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from novaclient import exceptions
 from novaclient.tests.unit.fixture_data import client
 from novaclient.tests.unit.fixture_data import server_groups as data
 from novaclient.tests.unit import utils
@@ -71,3 +72,24 @@ class ServerGroupsTest(utils.FixturedTestCase):
         ret = server_group.delete()
         self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
         self.assert_called('DELETE', '/os-server-groups/%s' % id)
+
+    def test_find_server_groups_by_name(self):
+        expected_name = 'ig1'
+        kwargs = {self.cs.server_groups.resource_class.NAME_ATTR:
+                  expected_name}
+        server_group = self.cs.server_groups.find(**kwargs)
+        self.assert_request_id(server_group, fakes.FAKE_REQUEST_ID_LIST)
+        self.assert_called('GET', '/os-server-groups')
+        self.assertIsInstance(server_group, server_groups.ServerGroup)
+        actual_name = getattr(server_group,
+                              self.cs.server_groups.resource_class.NAME_ATTR)
+        self.assertEqual(expected_name, actual_name)
+
+    def test_find_no_existing_server_groups_by_name(self):
+        expected_name = 'no-exist'
+        kwargs = {self.cs.server_groups.resource_class.NAME_ATTR:
+                  expected_name}
+        self.assertRaises(exceptions.NotFound,
+                          self.cs.server_groups.find,
+                          **kwargs)
+        self.assert_called('GET', '/os-server-groups')
diff --git a/novaclient/v2/server_groups.py b/novaclient/v2/server_groups.py
index 9b0ae870d..77ee84f5b 100644
--- a/novaclient/v2/server_groups.py
+++ b/novaclient/v2/server_groups.py
@@ -24,7 +24,6 @@ class ServerGroup(base.Resource):
     """
     A server group.
     """
-    NAME_ATTR = 'server_group_name'
 
     def __repr__(self):
         return '<ServerGroup: %s>' % self.id