diff --git a/apps/amo/tests/test_url_prefix.py b/apps/amo/tests/test_url_prefix.py
index 259cc37953..3fb0f3862f 100644
--- a/apps/amo/tests/test_url_prefix.py
+++ b/apps/amo/tests/test_url_prefix.py
@@ -47,9 +47,10 @@ class MiddlewareTest(test.TestCase):
     def test_marketplace_redirection(self):
         # We're forcing en-US since Marketplace isn't localized yet.
         redirections = {
-            '/': '/en-US/developers',
-            '/en-US/': '/en-US/developers',
-            '/fr/': '/en-US/developers',
+            '/': '/en-US/developers/',
+            '/developers': '/en-US/developers',
+            '/en-US/': '/en-US/developers/',
+            '/fr/': '/en-US/developers/',
             '/fr/developers': '/en-US/developers',
         }
         for path, location in redirections.items():
diff --git a/apps/amo/urlresolvers.py b/apps/amo/urlresolvers.py
index ab7fe286a1..29ea4b3986 100644
--- a/apps/amo/urlresolvers.py
+++ b/apps/amo/urlresolvers.py
@@ -133,15 +133,15 @@ class Prefixer(object):
             locale = self.locale if self.locale else self.get_language()
             url_parts.append(locale)
 
-        # Temporarily force home page to /locale/developers/.
+        # Temporarily force home page to /<locale>/developers/.
         if settings.MARKETPLACE and not path.partition('/')[0]:
             url_parts.append('developers')
+
         elif path.partition('/')[0] not in settings.SUPPORTED_NONAPPS:
             app = self.app if self.app else self.get_app()
             url_parts.append(app)
 
-        if not (settings.MARKETPLACE and not path.partition('/')[0]):
-            url_parts.append(path)
+        url_parts.append(path)
 
         return '/'.join(url_parts)
 
diff --git a/apps/reviews/tests/test_feeds.py b/apps/reviews/tests/test_feeds.py
index 2518eba2cb..9683be02a9 100644
--- a/apps/reviews/tests/test_feeds.py
+++ b/apps/reviews/tests/test_feeds.py
@@ -77,8 +77,13 @@ class TestAppsFeed(amo.tests.TestCase):
         assert url.endswith(self.url), (
             'Unexpected URL for <atom:link>: %r' % url)
 
-    @mock.patch.object(settings, 'APP_PREVIEW', True)
     def test_site_link(self):
         url = self.get_pq()('link').text()
-        assert url.endswith(reverse('apps.home')), (
+        assert url.endswith(reverse('home')), (
+            'Unexpected URL for <link>: %r' % url)
+
+    @mock.patch.object(settings, 'MARKETPLACE', True)
+    def test_site_link_mkt(self):
+        url = self.get_pq()('link').text()
+        assert url.endswith('/en-US/developers/'), (
             'Unexpected URL for <link>: %r' % url)