diff --git a/packages/gatsby/src/bootstrap/index.js b/packages/gatsby/src/bootstrap/index.js
index e29201a217969..16ff2a7fb62e5 100644
--- a/packages/gatsby/src/bootstrap/index.js
+++ b/packages/gatsby/src/bootstrap/index.js
@@ -72,10 +72,10 @@ module.exports = async (args: BootstrapArgs) => {
   activity.end()
 
   // Try opening the site's gatsby-config.js file.
-  activity = report.activityTimer(`open and validate gatsby-config.js`)
+  activity = report.activityTimer(`open and validate gatsby-config`)
   activity.start()
   const config = await preferDefault(
-    getConfigFile(program.directory, `gatsby-config.js`)
+    getConfigFile(program.directory, `gatsby-config`)
   )
 
   store.dispatch({
@@ -182,7 +182,7 @@ module.exports = async (args: BootstrapArgs) => {
 
     const envAPIs = plugin[`${env}APIs`]
     if (envAPIs && Array.isArray(envAPIs) && envAPIs.length > 0) {
-      return slash(path.join(plugin.resolve, `gatsby-${env}.js`))
+      return slash(path.join(plugin.resolve, `gatsby-${env}`))
     }
     return undefined
   }