diff --git a/gbpui/_50_gbp_project_add_panel_group.py b/gbpui/_1550_gbp_project_add_panel_group.py
similarity index 93%
rename from gbpui/_50_gbp_project_add_panel_group.py
rename to gbpui/_1550_gbp_project_add_panel_group.py
index 5ebe3a6..d57de7b 100644
--- a/gbpui/_50_gbp_project_add_panel_group.py
+++ b/gbpui/_1550_gbp_project_add_panel_group.py
@@ -11,6 +11,6 @@
 # under the License.
 
 ADD_INSTALLED_APPS = ['gbpui', ]
-PANEL_GROUP = 'panel_group.GroupPolicyPanels'
+PANEL_GROUP = 'GroupPolicyPanels'
 PANEL_GROUP_NAME = 'Policy'
 PANEL_GROUP_DASHBOARD = 'project'
diff --git a/gbpui/_60_gbp_project_add_panel.py b/gbpui/_1560_gbp_project_add_panel.py
similarity index 93%
rename from gbpui/_60_gbp_project_add_panel.py
rename to gbpui/_1560_gbp_project_add_panel.py
index 1ff8bf7..044a517 100644
--- a/gbpui/_60_gbp_project_add_panel.py
+++ b/gbpui/_1560_gbp_project_add_panel.py
@@ -12,5 +12,5 @@
 
 PANEL = 'policytargets_panel'
 PANEL_DASHBOARD = 'project'
-PANEL_GROUP = 'panel_group.GroupPolicyPanels'
+PANEL_GROUP = 'GroupPolicyPanels'
 ADD_PANEL = 'gbpui.panels.policytargets.panel.PolicyTargetGroup'
diff --git a/gbpui/_61_gbp_project_add_panel.py b/gbpui/_1561_gbp_project_add_panel.py
similarity index 93%
rename from gbpui/_61_gbp_project_add_panel.py
rename to gbpui/_1561_gbp_project_add_panel.py
index bc31abf..a396c12 100644
--- a/gbpui/_61_gbp_project_add_panel.py
+++ b/gbpui/_1561_gbp_project_add_panel.py
@@ -12,5 +12,5 @@
 
 PANEL = 'application_policy_panel'
 PANEL_DASHBOARD = 'project'
-PANEL_GROUP = 'panel_group.GroupPolicyPanels'
+PANEL_GROUP = 'GroupPolicyPanels'
 ADD_PANEL = 'gbpui.panels.application_policy.panel.ApplicationPolicy'
diff --git a/gbpui/_62_gbp_project_add_panel.py b/gbpui/_1562_gbp_project_add_panel.py
similarity index 93%
rename from gbpui/_62_gbp_project_add_panel.py
rename to gbpui/_1562_gbp_project_add_panel.py
index a1761a4..e70295c 100644
--- a/gbpui/_62_gbp_project_add_panel.py
+++ b/gbpui/_1562_gbp_project_add_panel.py
@@ -12,5 +12,5 @@
 
 PANEL = 'network_policy_panel'
 PANEL_DASHBOARD = 'project'
-PANEL_GROUP = 'panel_group.GroupPolicyPanels'
+PANEL_GROUP = 'GroupPolicyPanels'
 ADD_PANEL = 'gbpui.panels.network_policy.panel.NetworkPolicy'
diff --git a/gbpui/_63_gbp_project_add_panel.py b/gbpui/_1563_gbp_project_add_panel.py
similarity index 93%
rename from gbpui/_63_gbp_project_add_panel.py
rename to gbpui/_1563_gbp_project_add_panel.py
index b0347a8..dfdcbda 100644
--- a/gbpui/_63_gbp_project_add_panel.py
+++ b/gbpui/_1563_gbp_project_add_panel.py
@@ -12,5 +12,5 @@
 
 PANEL = 'network_services_panel'
 PANEL_DASHBOARD = 'project'
-PANEL_GROUP = 'panel_group.GroupPolicyPanels'
+PANEL_GROUP = 'GroupPolicyPanels'
 ADD_PANEL = 'gbpui.panels.network_services.panel.NetworkServices'
diff --git a/test-requirements.txt b/test-requirements.txt
index e082093..4ac807f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,22 +8,23 @@
 #
 # Hacking should appear first in case something else depends on pep8
 
--e git://github.com/openstack/horizon.git@stable/kilo#egg=horizon
+-e git://github.com/openstack/horizon.git@stable/liberty#egg=horizon
 hacking>=0.10.0,<0.11
 #
 coverage>=3.6
-django-nose
-mock>=1.0
-mox>=0.5.3
+django-nose>=1.2
+mock>=1.2
+mox3>=0.7.0
 nodeenv>=0.9.4 # BSD License
 nose
 nose-exclude
 nosehtmloutput>=0.0.3
 nosexcover
-openstack.nose_plugin>=0.7
-oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
+openstack.nose-plugin>=0.7
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+reno>=0.1.1 # Apache2
 selenium
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-testtools>=0.9.36,!=1.2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+testtools>=1.4.0
 # This also needs xvfb library installed on your OS
 xvfbwrapper>=0.1.3 #license: MIT