diff --git a/_pytest/config.py b/_pytest/config.py
index 43ae9f322..ab6018e4e 100644
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -16,8 +16,7 @@ def main(args=None, plugins=None):
                   initialization.
     """
     config = _prepareconfig(args, plugins)
-    exitstatus = config.hook.pytest_cmdline_main(config=config)
-    return exitstatus
+    return config.hook.pytest_cmdline_main(config=config)
 
 class cmdline:  # compatibility namespace
     main = staticmethod(main)
diff --git a/_pytest/python.py b/_pytest/python.py
index 8c8aed5d3..8085ac238 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1661,15 +1661,15 @@ class FixtureManager:
                                     yieldctx=marker.yieldctx,
                                     unittest=unittest)
             faclist = self._arg2fixturedefs.setdefault(name, [])
-            if not fixturedef.has_location:
-                # All fixturedefs with no location are at the front
+            if fixturedef.has_location:
+                faclist.append(fixturedef)
+            else:
+                # fixturedefs with no location are at the front
                 # so this inserts the current fixturedef after the
                 # existing fixturedefs from external plugins but
                 # before the fixturedefs provided in conftests.
                 i = len([f for f in faclist if not f.has_location])
-            else:
-                i = len(faclist)  # append
-            faclist.insert(i, fixturedef)
+                faclist.insert(i, fixturedef)
             if marker.autouse:
                 autousenames.append(name)
         if autousenames: