diff --git a/Libraries/Image/__tests__/__snapshots__/assetRelativePathInSnapshot.js.snap b/Libraries/Image/__tests__/__snapshots__/assetRelativePathInSnapshot-test.js.snap
similarity index 100%
rename from Libraries/Image/__tests__/__snapshots__/assetRelativePathInSnapshot.js.snap
rename to Libraries/Image/__tests__/__snapshots__/assetRelativePathInSnapshot-test.js.snap
diff --git a/Libraries/Image/__tests__/assetRelativePathInSnapshot.js b/Libraries/Image/__tests__/assetRelativePathInSnapshot-test.js
similarity index 100%
rename from Libraries/Image/__tests__/assetRelativePathInSnapshot.js
rename to Libraries/Image/__tests__/assetRelativePathInSnapshot-test.js
diff --git a/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js b/local-cli/core/__tests__/android/findAndroidAppFolder-test.js
similarity index 100%
rename from local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
rename to local-cli/core/__tests__/android/findAndroidAppFolder-test.js
diff --git a/local-cli/core/__tests__/android/findManifest.spec.js b/local-cli/core/__tests__/android/findManifest-test.js
similarity index 100%
rename from local-cli/core/__tests__/android/findManifest.spec.js
rename to local-cli/core/__tests__/android/findManifest-test.js
diff --git a/local-cli/core/__tests__/android/findPackageClassName.spec.js b/local-cli/core/__tests__/android/findPackageClassName-test.js
similarity index 100%
rename from local-cli/core/__tests__/android/findPackageClassName.spec.js
rename to local-cli/core/__tests__/android/findPackageClassName-test.js
diff --git a/local-cli/core/__tests__/android/getDependencyConfig.spec.js b/local-cli/core/__tests__/android/getDependencyConfig-test.js
similarity index 100%
rename from local-cli/core/__tests__/android/getDependencyConfig.spec.js
rename to local-cli/core/__tests__/android/getDependencyConfig-test.js
diff --git a/local-cli/core/__tests__/android/getProjectConfig.spec.js b/local-cli/core/__tests__/android/getProjectConfig-test.js
similarity index 100%
rename from local-cli/core/__tests__/android/getProjectConfig.spec.js
rename to local-cli/core/__tests__/android/getProjectConfig-test.js
diff --git a/local-cli/core/__tests__/android/readManifest.spec.js b/local-cli/core/__tests__/android/readManifest-test.js
similarity index 100%
rename from local-cli/core/__tests__/android/readManifest.spec.js
rename to local-cli/core/__tests__/android/readManifest-test.js
diff --git a/local-cli/core/__tests__/findAssets.spec.js b/local-cli/core/__tests__/findAssets-test.js
similarity index 100%
rename from local-cli/core/__tests__/findAssets.spec.js
rename to local-cli/core/__tests__/findAssets-test.js
diff --git a/local-cli/core/__tests__/findPlugins.spec.js b/local-cli/core/__tests__/findPlugins-test.js
similarity index 100%
rename from local-cli/core/__tests__/findPlugins.spec.js
rename to local-cli/core/__tests__/findPlugins-test.js
diff --git a/local-cli/core/__tests__/ios/findPodfilePath.spec.js b/local-cli/core/__tests__/ios/findPodfilePath-test.js
similarity index 100%
rename from local-cli/core/__tests__/ios/findPodfilePath.spec.js
rename to local-cli/core/__tests__/ios/findPodfilePath-test.js
diff --git a/local-cli/core/__tests__/ios/findPodspecName.spec.js b/local-cli/core/__tests__/ios/findPodspecName-test.js
similarity index 100%
rename from local-cli/core/__tests__/ios/findPodspecName.spec.js
rename to local-cli/core/__tests__/ios/findPodspecName-test.js
diff --git a/local-cli/core/__tests__/ios/findProject.spec.js b/local-cli/core/__tests__/ios/findProject-test.js
similarity index 100%
rename from local-cli/core/__tests__/ios/findProject.spec.js
rename to local-cli/core/__tests__/ios/findProject-test.js
diff --git a/local-cli/core/__tests__/ios/getProjectConfig.spec.js b/local-cli/core/__tests__/ios/getProjectConfig-test.js
similarity index 100%
rename from local-cli/core/__tests__/ios/getProjectConfig.spec.js
rename to local-cli/core/__tests__/ios/getProjectConfig-test.js
diff --git a/local-cli/core/__tests__/makeCommand.spec.js b/local-cli/core/__tests__/makeCommand-test.js
similarity index 100%
rename from local-cli/core/__tests__/makeCommand.spec.js
rename to local-cli/core/__tests__/makeCommand-test.js
diff --git a/local-cli/link/__tests__/android/applyPatch.spec.js b/local-cli/link/__tests__/android/applyPatch-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/applyPatch.spec.js
rename to local-cli/link/__tests__/android/applyPatch-test.js
diff --git a/local-cli/link/__tests__/android/isInstalled.spec.js b/local-cli/link/__tests__/android/isInstalled-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/isInstalled.spec.js
rename to local-cli/link/__tests__/android/isInstalled-test.js
diff --git a/local-cli/link/__tests__/android/makeBuildPatch.spec.js b/local-cli/link/__tests__/android/makeBuildPatch-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/makeBuildPatch.spec.js
rename to local-cli/link/__tests__/android/makeBuildPatch-test.js
diff --git a/local-cli/link/__tests__/android/makeImportPatch.spec.js b/local-cli/link/__tests__/android/makeImportPatch-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/makeImportPatch.spec.js
rename to local-cli/link/__tests__/android/makeImportPatch-test.js
diff --git a/local-cli/link/__tests__/android/makePackagePatch.spec.js b/local-cli/link/__tests__/android/makePackagePatch-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/makePackagePatch.spec.js
rename to local-cli/link/__tests__/android/makePackagePatch-test.js
diff --git a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js b/local-cli/link/__tests__/android/makeSettingsPatch-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/makeSettingsPatch.spec.js
rename to local-cli/link/__tests__/android/makeSettingsPatch-test.js
diff --git a/local-cli/link/__tests__/android/makeStringsPatch.spec.js b/local-cli/link/__tests__/android/makeStringsPatch-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/makeStringsPatch.spec.js
rename to local-cli/link/__tests__/android/makeStringsPatch-test.js
diff --git a/local-cli/link/__tests__/android/normalizeProjectName.spec.js b/local-cli/link/__tests__/android/normalizeProjectName-test.js
similarity index 100%
rename from local-cli/link/__tests__/android/normalizeProjectName.spec.js
rename to local-cli/link/__tests__/android/normalizeProjectName-test.js
diff --git a/local-cli/link/__tests__/getDependencyConfig.spec.js b/local-cli/link/__tests__/getDependencyConfig-test.js
similarity index 100%
rename from local-cli/link/__tests__/getDependencyConfig.spec.js
rename to local-cli/link/__tests__/getDependencyConfig-test.js
diff --git a/local-cli/link/__tests__/getProjectDependencies.spec.js b/local-cli/link/__tests__/getProjectDependencies-test.js
similarity index 100%
rename from local-cli/link/__tests__/getProjectDependencies.spec.js
rename to local-cli/link/__tests__/getProjectDependencies-test.js
diff --git a/local-cli/link/__tests__/groupFilesByType.spec.js b/local-cli/link/__tests__/groupFilesByType-test.js
similarity index 100%
rename from local-cli/link/__tests__/groupFilesByType.spec.js
rename to local-cli/link/__tests__/groupFilesByType-test.js
diff --git a/local-cli/link/__tests__/ios/addFileToProject.spec.js b/local-cli/link/__tests__/ios/addFileToProject-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/addFileToProject.spec.js
rename to local-cli/link/__tests__/ios/addFileToProject-test.js
diff --git a/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js b/local-cli/link/__tests__/ios/addProjectToLibraries-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
rename to local-cli/link/__tests__/ios/addProjectToLibraries-test.js
diff --git a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js b/local-cli/link/__tests__/ios/addSharedLibraries-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/addSharedLibraries.spec.js
rename to local-cli/link/__tests__/ios/addSharedLibraries-test.js
diff --git a/local-cli/link/__tests__/ios/createGroup.spec.js b/local-cli/link/__tests__/ios/createGroup-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/createGroup.spec.js
rename to local-cli/link/__tests__/ios/createGroup-test.js
diff --git a/local-cli/link/__tests__/ios/getBuildProperty.spec.js b/local-cli/link/__tests__/ios/getBuildProperty-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/getBuildProperty.spec.js
rename to local-cli/link/__tests__/ios/getBuildProperty-test.js
diff --git a/local-cli/link/__tests__/ios/getGroup.spec.js b/local-cli/link/__tests__/ios/getGroup-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/getGroup.spec.js
rename to local-cli/link/__tests__/ios/getGroup-test.js
diff --git a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js b/local-cli/link/__tests__/ios/getHeaderSearchPath-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
rename to local-cli/link/__tests__/ios/getHeaderSearchPath-test.js
diff --git a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js b/local-cli/link/__tests__/ios/getHeadersInFolder-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
rename to local-cli/link/__tests__/ios/getHeadersInFolder-test.js
diff --git a/local-cli/link/__tests__/ios/getPlist.spec.js b/local-cli/link/__tests__/ios/getPlist-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/getPlist.spec.js
rename to local-cli/link/__tests__/ios/getPlist-test.js
diff --git a/local-cli/link/__tests__/ios/getPlistPath.spec.js b/local-cli/link/__tests__/ios/getPlistPath-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/getPlistPath.spec.js
rename to local-cli/link/__tests__/ios/getPlistPath-test.js
diff --git a/local-cli/link/__tests__/ios/getTargets.spec.js b/local-cli/link/__tests__/ios/getTargets-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/getTargets.spec.js
rename to local-cli/link/__tests__/ios/getTargets-test.js
diff --git a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js b/local-cli/link/__tests__/ios/hasLibraryImported-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/hasLibraryImported.spec.js
rename to local-cli/link/__tests__/ios/hasLibraryImported-test.js
diff --git a/local-cli/link/__tests__/ios/isInstalled.spec.js b/local-cli/link/__tests__/ios/isInstalled-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/isInstalled.spec.js
rename to local-cli/link/__tests__/ios/isInstalled-test.js
diff --git a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js b/local-cli/link/__tests__/ios/mapHeaderSearchPaths-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
rename to local-cli/link/__tests__/ios/mapHeaderSearchPaths-test.js
diff --git a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js b/local-cli/link/__tests__/ios/removeProjectFromLibraries-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/removeProjectFromLibraries.js
rename to local-cli/link/__tests__/ios/removeProjectFromLibraries-test.js
diff --git a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js b/local-cli/link/__tests__/ios/removeProjectFromProject-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
rename to local-cli/link/__tests__/ios/removeProjectFromProject-test.js
diff --git a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js b/local-cli/link/__tests__/ios/removeSharedLibrary-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
rename to local-cli/link/__tests__/ios/removeSharedLibrary-test.js
diff --git a/local-cli/link/__tests__/ios/writePlist.spec.js b/local-cli/link/__tests__/ios/writePlist-test.js
similarity index 100%
rename from local-cli/link/__tests__/ios/writePlist.spec.js
rename to local-cli/link/__tests__/ios/writePlist-test.js
diff --git a/local-cli/link/__tests__/link.spec.js b/local-cli/link/__tests__/link-test.js
similarity index 100%
rename from local-cli/link/__tests__/link.spec.js
rename to local-cli/link/__tests__/link-test.js
diff --git a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js b/local-cli/link/__tests__/pods/findLineToAddPod-test.js
similarity index 100%
rename from local-cli/link/__tests__/pods/findLineToAddPod.spec.js
rename to local-cli/link/__tests__/pods/findLineToAddPod-test.js
diff --git a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile-test.js
similarity index 100%
rename from local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
rename to local-cli/link/__tests__/pods/findMarkedLinesInPodfile-test.js
diff --git a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js b/local-cli/link/__tests__/pods/findPodTargetLine-test.js
similarity index 100%
rename from local-cli/link/__tests__/pods/findPodTargetLine.spec.js
rename to local-cli/link/__tests__/pods/findPodTargetLine-test.js
diff --git a/local-cli/link/__tests__/pods/isInstalled.spec.js b/local-cli/link/__tests__/pods/isInstalled-test.js
similarity index 100%
rename from local-cli/link/__tests__/pods/isInstalled.spec.js
rename to local-cli/link/__tests__/pods/isInstalled-test.js
diff --git a/local-cli/link/__tests__/pods/removePodEntry.spec.js b/local-cli/link/__tests__/pods/removePodEntry-test.js
similarity index 100%
rename from local-cli/link/__tests__/pods/removePodEntry.spec.js
rename to local-cli/link/__tests__/pods/removePodEntry-test.js
diff --git a/local-cli/link/__tests__/promiseWaterfall.spec.js b/local-cli/link/__tests__/promiseWaterfall-test.js
similarity index 100%
rename from local-cli/link/__tests__/promiseWaterfall.spec.js
rename to local-cli/link/__tests__/promiseWaterfall-test.js