diff --git a/hbase-shell/src/main/ruby/shell/commands/move_servers_namespaces_rsgroup.rb b/hbase-shell/src/main/ruby/shell/commands/move_servers_namespaces_rsgroup.rb
index 93db81a5466c..2f7f505f32b9 100644
--- a/hbase-shell/src/main/ruby/shell/commands/move_servers_namespaces_rsgroup.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/move_servers_namespaces_rsgroup.rb
@@ -31,6 +31,10 @@ def help
 
       def command(dest, servers, namespaces)
         rsgroup_admin.move_servers_namespaces(dest, servers, namespaces)
+        namespaces.each do |ns|
+          arg = {'METHOD' => 'set', 'hbase.rsgroup.name' => dest}
+          admin.alter_namespace(ns, arg)
+        end
       end
     end
   end
diff --git a/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb b/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb
index 56b6a8e42ff8..791f5d3904f5 100644
--- a/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb
+++ b/hbase-shell/src/test/ruby/shell/rsgroup_shell_test.rb
@@ -151,8 +151,17 @@ def remove_rsgroup(group_name)
       assert_equal(hostport_str, ns_group.getServers.iterator.next.toString)
       assert_equal(ns_table_name, @admin.listTablesInRSGroup(ns_group_name).iterator.next.toString)
 
+      ns_table_name2 = 'test_namespace:test_ns_table2'
+      @shell.command(:create, ns_table_name2, 'f')
+
+      assert_true(@admin.listTablesInRSGroup(ns_group_name).contains(org.apache.hadoop.hbase.TableName.valueOf(ns_table_name2)))
+      assert_equal(2, @admin.listTablesInRSGroup(ns_group_name).count)
+      assert_equal(ns_group_name, @admin.getNamespaceDescriptor('test_namespace').getConfigurationValue('hbase.rsgroup.name'))
+
       @shell.command(:disable, ns_table_name)
       @shell.command(:drop, ns_table_name)
+      @shell.command(:disable, ns_table_name2)
+      @shell.command(:drop, ns_table_name2)
       @shell.command(:drop_namespace, namespace_name)
       remove_rsgroup(ns_group_name)
     end