diff --git a/lms/envs/common.py b/lms/envs/common.py
index 2db516a970..c34c59136f 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1122,7 +1122,7 @@ MIDDLEWARE_CLASSES = (
     'splash.middleware.SplashMiddleware',
 
 
-    'geoinfo.middleware.CountryMiddleware',
+    'openedx.core.djangoapps.geoinfo.middleware.CountryMiddleware',
     'embargo.middleware.EmbargoMiddleware',
 
     # Allows us to set user preferences
diff --git a/common/djangoapps/geoinfo/__init__.py b/openedx/core/djangoapps/geoinfo/__init__.py
similarity index 100%
rename from common/djangoapps/geoinfo/__init__.py
rename to openedx/core/djangoapps/geoinfo/__init__.py
diff --git a/common/djangoapps/geoinfo/middleware.py b/openedx/core/djangoapps/geoinfo/middleware.py
similarity index 100%
rename from common/djangoapps/geoinfo/middleware.py
rename to openedx/core/djangoapps/geoinfo/middleware.py
diff --git a/common/djangoapps/geoinfo/tests/__init__.py b/openedx/core/djangoapps/geoinfo/tests/__init__.py
similarity index 100%
rename from common/djangoapps/geoinfo/tests/__init__.py
rename to openedx/core/djangoapps/geoinfo/tests/__init__.py
diff --git a/common/djangoapps/geoinfo/tests/test_middleware.py b/openedx/core/djangoapps/geoinfo/tests/test_middleware.py
similarity index 98%
rename from common/djangoapps/geoinfo/tests/test_middleware.py
rename to openedx/core/djangoapps/geoinfo/tests/test_middleware.py
index ae7083b9b7..f77e9a01d9 100644
--- a/common/djangoapps/geoinfo/tests/test_middleware.py
+++ b/openedx/core/djangoapps/geoinfo/tests/test_middleware.py
@@ -1,3 +1,4 @@
+# pylint: disable=no-member
 """
 Tests for CountryMiddleware.
 """
@@ -7,8 +8,8 @@ import pygeoip
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import TestCase
 from django.test.client import RequestFactory
-from geoinfo.middleware import CountryMiddleware
 
+from openedx.core.djangoapps.geoinfo.middleware import CountryMiddleware
 from student.tests.factories import UserFactory, AnonymousUserFactory