From 5501be249b7acdf4946685b4c298bcedc0f847b7 Mon Sep 17 00:00:00 2001
From: Jamis Charles <jacharles@paypal.com>
Date: Fri, 12 Jan 2018 19:39:11 -0800
Subject: [PATCH] chore(filenames): fix intergration-tests subfolders

Fixes all the folder names in the integration-tests folder to follow Facebook internal file / folder
naming conventions. This is the first of several incremental PRs.
---
 CHANGELOG.md                                  |  6 +++++
 .../coverage_report.test.js.snap              |  6 ++---
 .../__snapshots__/list_tests.test.js.snap     |  6 ++---
 .../__tests__/clear_cache.test.js             |  6 ++---
 integration-tests/__tests__/config.test.js    |  8 +++----
 .../__tests__/coverage_report.test.js         |  6 ++---
 .../custom_matcher_stack_trace.test.js        |  2 +-
 .../__tests__/custom_reporters.test.js        | 16 +++++++-------
 integration-tests/__tests__/debug.test.js     |  2 +-
 .../__tests__/empty_suite_error.test.js       |  2 +-
 .../__tests__/global_setup.test.js            |  6 ++---
 .../__tests__/global_teardown.test.js         |  6 ++---
 .../__tests__/jasmine_async.test.js           | 22 +++++++++----------
 .../__tests__/json_reporter.test.js           |  6 ++---
 .../__tests__/list_tests.test.js              |  4 ++--
 .../__tests__/location_in_results.test.js     |  4 ++--
 .../__tests__/module_name_mapper.test.js      |  4 ++--
 .../__tests__/nested_event_loop.test.js       |  2 +-
 .../__tests__/no_test_found.test.js           |  2 +-
 .../__tests__/no_tests_found.test.js          |  2 +-
 integration-tests/__tests__/node_path.test.js |  4 ++--
 .../__tests__/set_immediate.test.js           |  2 +-
 ...t_framework_script_file_cli_config.test.js |  4 ++--
 .../__tests__/stack_trace.test.js             | 14 ++++++------
 .../stack_trace_no_captureStackTrace.test.js  |  2 +-
 .../__tests__/timer_reset_mocks.test.js       |  4 ++--
 .../__tests__/timer_use_real_timers.test.js   |  2 +-
 integration-tests/__tests__/verbose.test.js   |  2 +-
 .../__tests__/clear_cache.test.js             |  0
 .../{clear_cache => clear-cache}/package.json |  0
 .../.gitignore                                |  0
 .../__mocks__/sum_dependency.js               |  0
 .../__tests__/sum.test.js                     |  0
 .../a/__tests__/identical.test.js             |  0
 .../cached-duplicates/a/identical.js          |  0
 .../b/__tests__/identical.test.js             |  0
 .../cached-duplicates/b/identical.js          |  0
 .../not-required-in-test-suite.js             |  0
 .../other-file.js                             |  0
 .../package.json                              |  0
 .../setup.js                                  |  0
 .../sum.js                                    |  0
 .../sum_dependency.js                         |  0
 .../__tests__/custom_matcher.test.js          |  0
 .../package.json                              |  0
 .../__tests__/add.test.js                     |  0
 .../__tests__/add_fail.test.js                |  0
 .../add.js                                    |  0
 .../package.json                              |  0
 .../reporters/incomplete_reporter.js          |  0
 .../reporters/test_reporter.js                |  0
 .../__tests__/empty_suite.test.js             |  0
 .../package.json                              |  0
 .../__tests__/setup1.test.js                  |  2 +-
 .../__tests__/setup2.test.js                  |  2 +-
 .../__tests__/setup3.test.js                  |  2 +-
 .../package.json                              |  0
 .../{global_setup => global-setup}/setup.js   |  2 +-
 .../__tests__/teardown1.test.js               |  2 +-
 .../__tests__/teardown2.test.js               |  2 +-
 .../__tests__/teardown3.test.js               |  2 +-
 .../package.json                              |  0
 .../teardown.js                               |  2 +-
 .../__tests__/async_test_fails.test.js        |  0
 .../__tests__/concurrent.test.js              |  0
 .../__tests__/generator.test.js               |  0
 .../__tests__/promise_after_all.test.js       |  0
 .../__tests__/promise_after_each.test.js      |  0
 .../__tests__/promise_before_all.test.js      |  0
 .../__tests__/promise_before_each.test.js     |  0
 .../__tests__/promise_fit.test.js             |  0
 .../__tests__/promise_it.test.js              |  0
 .../__tests__/promise_xit.test.js             |  0
 .../__tests__/returning_values.test.js        |  0
 .../package.json                              |  0
 .../__tests__/sum.test.js                     |  0
 .../package.json                              |  0
 .../{json_reporter => json-reporter}/sum.js   |  0
 .../__tests__/dummy.test.js                   |  0
 .../__tests__/other.test.js                   |  0
 .../{list_tests => list-tests}/package.json   |  0
 .../__tests__/test.js                         |  0
 .../package.json                              |  0
 .../__mocks__/style_mock.js                   |  0
 .../__tests__/index.js                        |  0
 .../index.js                                  |  0
 .../package.json                              |  0
 .../style.css                                 |  0
 .../__tests__/index.js                        |  0
 .../index.js                                  |  0
 .../package.json                              |  0
 .../style.css                                 |  0
 .../__tests__/nested_event_loop.test.js       |  0
 .../package.json                              |  0
 .../package.json                              |  0
 .../__tests__/node_path.test.js               |  0
 .../{node_path => node-path}/package.json     |  0
 .../{node_path => node-path}/src/path/file.js |  0
 .../__tests__/set_immediate.test.js           |  0
 .../package.json                              |  0
 .../__tests__/runner_patch.test.js            |  0
 .../__tests__/test1.test.js                   |  0
 .../__tests__/test2.test.js                   |  0
 .../package.json                              |  0
 .../setup1.js                                 |  0
 .../setup_hooks_into_runner.js                |  0
 .../__tests__/runtime_error.test.js           |  0
 .../package.json                              |  0
 .../__tests__/runtime_error.test.js           |  0
 .../__tests__/stack_trace.test.js             |  0
 .../stack_trace_without_message.test.js       |  0
 .../__tests__/test_error.test.js              |  0
 .../package.json                              |  0
 .../after-reset-all-mocks}/index.js           |  0
 .../after-reset-all-mocks}/package.json       |  0
 .../timer_and_mock.test.js                    |  0
 .../with-reset-mocks}/index.js                |  0
 .../with-reset-mocks}/package.json            |  0
 .../with-reset-mocks}/timer_with_mock.test.js |  0
 .../__tests__/use_real_timers.test.js         |  0
 .../package.json                              |  0
 .../__tests__/verbose.test.js                 |  0
 .../package.json                              |  0
 123 files changed, 87 insertions(+), 81 deletions(-)
 rename integration-tests/{clear_cache => clear-cache}/__tests__/clear_cache.test.js (100%)
 rename integration-tests/{clear_cache => clear-cache}/package.json (100%)
 rename integration-tests/{coverage_report => coverage-report}/.gitignore (100%)
 rename integration-tests/{coverage_report => coverage-report}/__mocks__/sum_dependency.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/__tests__/sum.test.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/cached-duplicates/a/__tests__/identical.test.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/cached-duplicates/a/identical.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/cached-duplicates/b/__tests__/identical.test.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/cached-duplicates/b/identical.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/not-required-in-test-suite.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/other-file.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/package.json (100%)
 rename integration-tests/{coverage_report => coverage-report}/setup.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/sum.js (100%)
 rename integration-tests/{coverage_report => coverage-report}/sum_dependency.js (100%)
 rename integration-tests/{custom_matcher_stack_trace => custom-matcher-stack-trace}/__tests__/custom_matcher.test.js (100%)
 rename integration-tests/{custom_matcher_stack_trace => custom-matcher-stack-trace}/package.json (100%)
 rename integration-tests/{custom_reporters => custom-reporters}/__tests__/add.test.js (100%)
 rename integration-tests/{custom_reporters => custom-reporters}/__tests__/add_fail.test.js (100%)
 rename integration-tests/{custom_reporters => custom-reporters}/add.js (100%)
 rename integration-tests/{custom_reporters => custom-reporters}/package.json (100%)
 rename integration-tests/{custom_reporters => custom-reporters}/reporters/incomplete_reporter.js (100%)
 rename integration-tests/{custom_reporters => custom-reporters}/reporters/test_reporter.js (100%)
 rename integration-tests/{empty_suite_error => empty-suite-error}/__tests__/empty_suite.test.js (100%)
 rename integration-tests/{empty_suite_error => empty-suite-error}/package.json (100%)
 rename integration-tests/{global_setup => global-setup}/__tests__/setup1.test.js (90%)
 rename integration-tests/{global_setup => global-setup}/__tests__/setup2.test.js (90%)
 rename integration-tests/{global_setup => global-setup}/__tests__/setup3.test.js (90%)
 rename integration-tests/{global_setup => global-setup}/package.json (100%)
 rename integration-tests/{global_setup => global-setup}/setup.js (91%)
 rename integration-tests/{global_teardown => global-teardown}/__tests__/teardown1.test.js (87%)
 rename integration-tests/{global_teardown => global-teardown}/__tests__/teardown2.test.js (87%)
 rename integration-tests/{global_teardown => global-teardown}/__tests__/teardown3.test.js (87%)
 rename integration-tests/{global_teardown => global-teardown}/package.json (100%)
 rename integration-tests/{global_teardown => global-teardown}/teardown.js (90%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/async_test_fails.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/concurrent.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/generator.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/promise_after_all.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/promise_after_each.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/promise_before_all.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/promise_before_each.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/promise_fit.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/promise_it.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/promise_xit.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/__tests__/returning_values.test.js (100%)
 rename integration-tests/{jasmine_async => jasmine-async}/package.json (100%)
 rename integration-tests/{json_reporter => json-reporter}/__tests__/sum.test.js (100%)
 rename integration-tests/{json_reporter => json-reporter}/package.json (100%)
 rename integration-tests/{json_reporter => json-reporter}/sum.js (100%)
 rename integration-tests/{list_tests => list-tests}/__tests__/dummy.test.js (100%)
 rename integration-tests/{list_tests => list-tests}/__tests__/other.test.js (100%)
 rename integration-tests/{list_tests => list-tests}/package.json (100%)
 rename integration-tests/{location_in_results => location-in-results}/__tests__/test.js (100%)
 rename integration-tests/{location_in_results => location-in-results}/package.json (100%)
 rename integration-tests/{module_name_mapper_correct_config => module-name-mapper-correct-config}/__mocks__/style_mock.js (100%)
 rename integration-tests/{module_name_mapper_correct_config => module-name-mapper-correct-config}/__tests__/index.js (100%)
 rename integration-tests/{module_name_mapper_correct_config => module-name-mapper-correct-config}/index.js (100%)
 rename integration-tests/{module_name_mapper_correct_config => module-name-mapper-correct-config}/package.json (100%)
 rename integration-tests/{module_name_mapper_correct_config => module-name-mapper-correct-config}/style.css (100%)
 rename integration-tests/{module_name_mapper_wrong_config => module-name-mapper-wrong-config}/__tests__/index.js (100%)
 rename integration-tests/{module_name_mapper_wrong_config => module-name-mapper-wrong-config}/index.js (100%)
 rename integration-tests/{module_name_mapper_wrong_config => module-name-mapper-wrong-config}/package.json (100%)
 rename integration-tests/{module_name_mapper_wrong_config => module-name-mapper-wrong-config}/style.css (100%)
 rename integration-tests/{nested_event_loop => nested-event-loop}/__tests__/nested_event_loop.test.js (100%)
 rename integration-tests/{nested_event_loop => nested-event-loop}/package.json (100%)
 rename integration-tests/{no_tests_found-test => no-tests-found-test}/package.json (100%)
 rename integration-tests/{node_path => node-path}/__tests__/node_path.test.js (100%)
 rename integration-tests/{node_path => node-path}/package.json (100%)
 rename integration-tests/{node_path => node-path}/src/path/file.js (100%)
 rename integration-tests/{set_immediate => set-immediate}/__tests__/set_immediate.test.js (100%)
 rename integration-tests/{set_immediate => set-immediate}/package.json (100%)
 rename integration-tests/{setup_test_framework_script_file_cli_config => setup-test-framework-script-file-cli-config}/__tests__/runner_patch.test.js (100%)
 rename integration-tests/{setup_test_framework_script_file_cli_config => setup-test-framework-script-file-cli-config}/__tests__/test1.test.js (100%)
 rename integration-tests/{setup_test_framework_script_file_cli_config => setup-test-framework-script-file-cli-config}/__tests__/test2.test.js (100%)
 rename integration-tests/{setup_test_framework_script_file_cli_config => setup-test-framework-script-file-cli-config}/package.json (100%)
 rename integration-tests/{setup_test_framework_script_file_cli_config => setup-test-framework-script-file-cli-config}/setup1.js (100%)
 rename integration-tests/{setup_test_framework_script_file_cli_config => setup-test-framework-script-file-cli-config}/setup_hooks_into_runner.js (100%)
 rename integration-tests/{stack_trace_no_captureStackTrace => stack-trace-no-capture-stack-trace}/__tests__/runtime_error.test.js (100%)
 rename integration-tests/{stack_trace => stack-trace-no-capture-stack-trace}/package.json (100%)
 rename integration-tests/{stack_trace => stack-trace}/__tests__/runtime_error.test.js (100%)
 rename integration-tests/{stack_trace => stack-trace}/__tests__/stack_trace.test.js (100%)
 rename integration-tests/{stack_trace => stack-trace}/__tests__/stack_trace_without_message.test.js (100%)
 rename integration-tests/{stack_trace => stack-trace}/__tests__/test_error.test.js (100%)
 rename integration-tests/{stack_trace_no_captureStackTrace => stack-trace}/package.json (100%)
 rename integration-tests/{timer-resetMocks/after_resetAllMocks => timer-reset-mocks/after-reset-all-mocks}/index.js (100%)
 rename integration-tests/{timer-resetMocks/after_resetAllMocks => timer-reset-mocks/after-reset-all-mocks}/package.json (100%)
 rename integration-tests/{timer-resetMocks/after_resetAllMocks => timer-reset-mocks/after-reset-all-mocks}/timer_and_mock.test.js (100%)
 rename integration-tests/{timer-resetMocks/with_resetMocks => timer-reset-mocks/with-reset-mocks}/index.js (100%)
 rename integration-tests/{timer-resetMocks/with_resetMocks => timer-reset-mocks/with-reset-mocks}/package.json (100%)
 rename integration-tests/{timer-resetMocks/with_resetMocks => timer-reset-mocks/with-reset-mocks}/timer_with_mock.test.js (100%)
 rename integration-tests/{timer_use_real_timers => timer-use-real-timers}/__tests__/use_real_timers.test.js (100%)
 rename integration-tests/{timer_use_real_timers => timer-use-real-timers}/package.json (100%)
 rename integration-tests/{verbose_reporter => verbose-reporter}/__tests__/verbose.test.js (100%)
 rename integration-tests/{verbose_reporter => verbose-reporter}/package.json (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 158332c07c47..cdd2fc487461 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@
   the case of `--lastCommit`, `--findRelatedTests`, or `--onlyChanged` options
   having been passed to the CLI
 
+### Chore & Maintenance
+
+* `[filenames]` Standardize folder names under `integration-tests/`
+  ([#5298](https://github.com/facebook/jest/pull/5298))
+
+
 ## jest 22.0.6
 
 ### Fixes
diff --git a/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap b/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap
index 62e00267973b..0fe0d842cbeb 100644
--- a/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap
+++ b/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap
@@ -47,14 +47,14 @@ exports[`outputs coverage report 1`] = `
 File                                 |  % Stmts | % Branch |  % Funcs |  % Lines |Uncovered Lines |
 -------------------------------------|----------|----------|----------|----------|----------------|
 All files                            |    56.52 |        0 |       50 |    56.52 |                |
- coverage_report                     |    41.18 |        0 |       25 |    41.18 |                |
+ coverage-report                     |    41.18 |        0 |       25 |    41.18 |                |
   not-required-in-test-suite.js      |        0 |        0 |        0 |        0 |  8,15,16,17,19 |
   other-file.js                      |      100 |      100 |      100 |      100 |                |
   sum.js                             |    85.71 |      100 |       50 |    85.71 |             12 |
   sum_dependency.js                  |        0 |        0 |        0 |        0 |     8,10,11,14 |
- coverage_report/cached-duplicates/a |      100 |      100 |      100 |      100 |                |
+ coverage-report/cached-duplicates/a |      100 |      100 |      100 |      100 |                |
   identical.js                       |      100 |      100 |      100 |      100 |                |
- coverage_report/cached-duplicates/b |      100 |      100 |      100 |      100 |                |
+ coverage-report/cached-duplicates/b |      100 |      100 |      100 |      100 |                |
   identical.js                       |      100 |      100 |      100 |      100 |                |
 -------------------------------------|----------|----------|----------|----------|----------------|
 "
diff --git a/integration-tests/__tests__/__snapshots__/list_tests.test.js.snap b/integration-tests/__tests__/__snapshots__/list_tests.test.js.snap
index 9f5598ae7931..b6e82485fe29 100644
--- a/integration-tests/__tests__/__snapshots__/list_tests.test.js.snap
+++ b/integration-tests/__tests__/__snapshots__/list_tests.test.js.snap
@@ -2,8 +2,8 @@
 
 exports[`--listTests flag causes tests to be printed in different lines 1`] = `
 "
-/MOCK_ABOLUTE_PATH/integration-tests/list_tests/__tests__/dummy.test.js
-/MOCK_ABOLUTE_PATH/integration-tests/list_tests/__tests__/other.test.js"
+/MOCK_ABOLUTE_PATH/integration-tests/list-tests/__tests__/dummy.test.js
+/MOCK_ABOLUTE_PATH/integration-tests/list-tests/__tests__/other.test.js"
 `;
 
-exports[`--listTests flag causes tests to be printed out as JSON when using the --json flag 1`] = `"[\\"/MOCK_ABOLUTE_PATH/integration-tests/list_tests/__tests__/dummy.test.js\\",\\"/MOCK_ABOLUTE_PATH/integration-tests/list_tests/__tests__/other.test.js\\"]"`;
+exports[`--listTests flag causes tests to be printed out as JSON when using the --json flag 1`] = `"[\\"/MOCK_ABOLUTE_PATH/integration-tests/list-tests/__tests__/dummy.test.js\\",\\"/MOCK_ABOLUTE_PATH/integration-tests/list-tests/__tests__/other.test.js\\"]"`;
diff --git a/integration-tests/__tests__/clear_cache.test.js b/integration-tests/__tests__/clear_cache.test.js
index a0954fd8edd1..5f0a0a979749 100644
--- a/integration-tests/__tests__/clear_cache.test.js
+++ b/integration-tests/__tests__/clear_cache.test.js
@@ -13,11 +13,11 @@ const os = require('os');
 const path = require('path');
 const runJest = require('../runJest');
 
-const CACHE = path.resolve(os.tmpdir(), 'clear_cache_directory');
+const CACHE = path.resolve(os.tmpdir(), 'clear-cache_directory');
 
 describe('jest --clearCache', () => {
   test('normal run results in cache directory being written', () => {
-    const {status} = runJest('clear_cache', [`--cacheDirectory=${CACHE}`]);
+    const {status} = runJest('clear-cache', [`--cacheDirectory=${CACHE}`]);
 
     expect(fs.existsSync(CACHE)).toBe(true);
     expect(status).toBe(0);
@@ -25,7 +25,7 @@ describe('jest --clearCache', () => {
   test('clearCache results in deleted directory and exit status 0', () => {
     expect(fs.existsSync(CACHE)).toBe(true);
 
-    const {status, stdout, stderr} = runJest('clear_cache', [
+    const {status, stdout, stderr} = runJest('clear-cache', [
       '--clearCache',
       `--cacheDirectory=${CACHE}`,
     ]);
diff --git a/integration-tests/__tests__/config.test.js b/integration-tests/__tests__/config.test.js
index a0a8fa7ac700..af5fa4e11b3f 100644
--- a/integration-tests/__tests__/config.test.js
+++ b/integration-tests/__tests__/config.test.js
@@ -11,7 +11,7 @@
 const runJest = require('../runJest');
 
 test('config as JSON', () => {
-  const result = runJest('verbose_reporter', [
+  const result = runJest('verbose-reporter', [
     '--config=' +
       JSON.stringify({
         testEnvironment: 'node',
@@ -25,7 +25,7 @@ test('config as JSON', () => {
 });
 
 test('works with sane config JSON', () => {
-  const result = runJest('verbose_reporter', [
+  const result = runJest('verbose-reporter', [
     '--config=' +
       JSON.stringify({
         testEnvironment: 'node',
@@ -38,7 +38,7 @@ test('works with sane config JSON', () => {
 });
 
 test('watchman config option is respected over default argv', () => {
-  const {stdout} = runJest('verbose_reporter', [
+  const {stdout} = runJest('verbose-reporter', [
     '--env=node',
     '--watchman=false',
     '--debug',
@@ -48,7 +48,7 @@ test('watchman config option is respected over default argv', () => {
 });
 
 test('config from argv is respected with sane config JSON', () => {
-  const {stdout} = runJest('verbose_reporter', [
+  const {stdout} = runJest('verbose-reporter', [
     '--config=' +
       JSON.stringify({
         testEnvironment: 'node',
diff --git a/integration-tests/__tests__/coverage_report.test.js b/integration-tests/__tests__/coverage_report.test.js
index 6f3045999bda..0f02c83775df 100644
--- a/integration-tests/__tests__/coverage_report.test.js
+++ b/integration-tests/__tests__/coverage_report.test.js
@@ -14,13 +14,13 @@ const skipOnWindows = require('../../scripts/skip_on_windows');
 const {extractSummary} = require('../utils');
 const runJest = require('../runJest');
 
-const DIR = path.resolve(__dirname, '../coverage_report');
+const DIR = path.resolve(__dirname, '../coverage-report');
 
 skipOnWindows.suite();
 
 test('outputs coverage report', () => {
   const {stdout, status} = runJest(DIR, ['--no-cache', '--coverage']);
-  const coverageDir = path.resolve(__dirname, '../coverage_report/coverage');
+  const coverageDir = path.resolve(__dirname, '../coverage-report/coverage');
 
   // - the `setup.js` file is ignored and should not be in the coverage report.
   // - `sum_dependency.js` is mocked and the real module is never required but
@@ -60,7 +60,7 @@ test('collects coverage only from specified files avoiding dependencies', () =>
 });
 
 test('json reporter printing with --coverage', () => {
-  const {stderr, status} = runJest('json_reporter', ['--coverage']);
+  const {stderr, status} = runJest('json-reporter', ['--coverage']);
   const {summary} = extractSummary(stderr);
   expect(status).toBe(1);
   expect(summary).toMatchSnapshot();
diff --git a/integration-tests/__tests__/custom_matcher_stack_trace.test.js b/integration-tests/__tests__/custom_matcher_stack_trace.test.js
index fb4d9f817ce4..d33af4fea2c8 100644
--- a/integration-tests/__tests__/custom_matcher_stack_trace.test.js
+++ b/integration-tests/__tests__/custom_matcher_stack_trace.test.js
@@ -15,7 +15,7 @@ const skipOnWindows = require('../../scripts/skip_on_windows');
 skipOnWindows.suite();
 
 test('works with custom matchers', () => {
-  const {stderr} = runJest('custom_matcher_stack_trace');
+  const {stderr} = runJest('custom-matcher-stack-trace');
 
   let {rest} = extractSummary(stderr);
 
diff --git a/integration-tests/__tests__/custom_reporters.test.js b/integration-tests/__tests__/custom_reporters.test.js
index 4463b73eea9d..e5dcd4014677 100644
--- a/integration-tests/__tests__/custom_reporters.test.js
+++ b/integration-tests/__tests__/custom_reporters.test.js
@@ -14,7 +14,7 @@ const runJest = require('../runJest');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.resolve(os.tmpdir(), 'custom_reporters_test_dir');
+const DIR = path.resolve(os.tmpdir(), 'custom-reporters_test_dir');
 
 beforeEach(() => cleanup(DIR));
 afterEach(() => cleanup(DIR));
@@ -27,7 +27,7 @@ describe('Custom Reporters Integration', () => {
       reporters: ['<rootDir>/reporters/test_reporter.js'],
     };
 
-    const {status} = runJest('custom_reporters', [
+    const {status} = runJest('custom-reporters', [
       '--config',
       JSON.stringify(reporterConfig),
       'add.test.js',
@@ -46,7 +46,7 @@ describe('Custom Reporters Integration', () => {
       ],
     };
 
-    const {status, stdout} = runJest('custom_reporters', [
+    const {status, stdout} = runJest('custom-reporters', [
       '--config',
       JSON.stringify(reporterConfig),
       'add.test.js',
@@ -61,7 +61,7 @@ describe('Custom Reporters Integration', () => {
       reporters: [[3243242]],
     };
 
-    const {status, stderr} = runJest('custom_reporters', [
+    const {status, stderr} = runJest('custom-reporters', [
       '--config',
       JSON.stringify(reporterConfig),
       'add.test.js',
@@ -72,7 +72,7 @@ describe('Custom Reporters Integration', () => {
   });
 
   test('default reporters enabled', () => {
-    const {stderr, stdout, status} = runJest('custom_reporters', [
+    const {stderr, stdout, status} = runJest('custom-reporters', [
       '--config',
       JSON.stringify({
         reporters: ['default', '<rootDir>/reporters/test_reporter.js'],
@@ -90,7 +90,7 @@ describe('Custom Reporters Integration', () => {
   });
 
   test('TestReporter with all tests passing', () => {
-    const {stdout, status, stderr} = runJest('custom_reporters', [
+    const {stdout, status, stderr} = runJest('custom-reporters', [
       'add.test.js',
     ]);
 
@@ -102,7 +102,7 @@ describe('Custom Reporters Integration', () => {
   });
 
   test('TestReporter with all tests failing', () => {
-    const {stdout, status, stderr} = runJest('custom_reporters', [
+    const {stdout, status, stderr} = runJest('custom-reporters', [
       'add_fail.test.js',
     ]);
 
@@ -114,7 +114,7 @@ describe('Custom Reporters Integration', () => {
   });
 
   test('IncompleteReporter for flexibility', () => {
-    const {stderr, stdout, status} = runJest('custom_reporters', [
+    const {stderr, stdout, status} = runJest('custom-reporters', [
       '--no-cache',
       '--config',
       JSON.stringify({
diff --git a/integration-tests/__tests__/debug.test.js b/integration-tests/__tests__/debug.test.js
index 95e90b017cbb..87529ebb4fa0 100644
--- a/integration-tests/__tests__/debug.test.js
+++ b/integration-tests/__tests__/debug.test.js
@@ -13,7 +13,7 @@ const runJest = require('../runJest');
 describe('jest --debug', () => {
   skipOnWindows.suite();
 
-  const dir = path.resolve(__dirname, '..', 'verbose_reporter');
+  const dir = path.resolve(__dirname, '..', 'verbose-reporter');
 
   it('outputs debugging info before running the test', () => {
     const {stdout} = runJest(dir, ['--debug', '--no-cache']);
diff --git a/integration-tests/__tests__/empty_suite_error.test.js b/integration-tests/__tests__/empty_suite_error.test.js
index 140098c77d21..8623cb386c40 100644
--- a/integration-tests/__tests__/empty_suite_error.test.js
+++ b/integration-tests/__tests__/empty_suite_error.test.js
@@ -11,7 +11,7 @@
 const path = require('path');
 const runJest = require('../runJest');
 
-const DIR = path.resolve(__dirname, '../empty_suite_error');
+const DIR = path.resolve(__dirname, '../empty-suite-error');
 
 describe('JSON Reporter', () => {
   it('fails the test suite if it contains no tests', () => {
diff --git a/integration-tests/__tests__/global_setup.test.js b/integration-tests/__tests__/global_setup.test.js
index 789ca6a87f1f..9e880c17c938 100644
--- a/integration-tests/__tests__/global_setup.test.js
+++ b/integration-tests/__tests__/global_setup.test.js
@@ -13,14 +13,14 @@ const path = require('path');
 const runJest = require('../runJest');
 const {cleanup} = require('../utils');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_setup');
+const DIR = path.join(os.tmpdir(), 'jest-global-setup');
 
 beforeEach(() => cleanup(DIR));
 afterAll(() => cleanup(DIR));
 
 test('globalSetup is triggered once before all test suites', () => {
-  const setupPath = path.resolve(__dirname, '../global_setup/setup.js');
-  const result = runJest.json('global_setup', [`--globalSetup=${setupPath}`]);
+  const setupPath = path.resolve(__dirname, '../global-setup/setup.js');
+  const result = runJest.json('global-setup', [`--globalSetup=${setupPath}`]);
   expect(result.status).toBe(0);
   const files = fs.readdirSync(DIR);
   expect(files).toHaveLength(1);
diff --git a/integration-tests/__tests__/global_teardown.test.js b/integration-tests/__tests__/global_teardown.test.js
index 3a8cb12b5d77..bc9dec1264e0 100644
--- a/integration-tests/__tests__/global_teardown.test.js
+++ b/integration-tests/__tests__/global_teardown.test.js
@@ -14,7 +14,7 @@ const path = require('path');
 const runJest = require('../runJest');
 const {cleanup} = require('../utils');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_teardown');
+const DIR = path.join(os.tmpdir(), 'jest-global-teardown');
 
 beforeEach(() => cleanup(DIR));
 afterAll(() => cleanup(DIR));
@@ -23,9 +23,9 @@ test('globalTeardown is triggered once after all test suites', () => {
   mkdirp.sync(DIR);
   const teardownPath = path.resolve(
     __dirname,
-    '../global_teardown/teardown.js',
+    '../global-teardown/teardown.js',
   );
-  const result = runJest.json('global_teardown', [
+  const result = runJest.json('global-teardown', [
     `--globalTeardown=${teardownPath}`,
   ]);
   expect(result.status).toBe(0);
diff --git a/integration-tests/__tests__/jasmine_async.test.js b/integration-tests/__tests__/jasmine_async.test.js
index 52ef3763f5c9..57ab317f2117 100644
--- a/integration-tests/__tests__/jasmine_async.test.js
+++ b/integration-tests/__tests__/jasmine_async.test.js
@@ -13,7 +13,7 @@ const runJest = require('../runJest');
 
 describe('async jasmine', () => {
   it('works with beforeAll', () => {
-    const result = runJest.json('jasmine_async', [
+    const result = runJest.json('jasmine-async', [
       'promise_before_all.test.js',
     ]);
     const json = result.json;
@@ -31,7 +31,7 @@ describe('async jasmine', () => {
   });
 
   it('works with beforeEach', () => {
-    const result = runJest.json('jasmine_async', [
+    const result = runJest.json('jasmine-async', [
       'promise_before_each.test.js',
     ]);
     const json = result.json;
@@ -47,7 +47,7 @@ describe('async jasmine', () => {
   });
 
   it('works with afterAll', () => {
-    const result = runJest.json('jasmine_async', ['promise_after_all.test.js']);
+    const result = runJest.json('jasmine-async', ['promise_after_all.test.js']);
     const json = result.json;
 
     expect(json.numTotalTests).toBe(2);
@@ -60,7 +60,7 @@ describe('async jasmine', () => {
   });
 
   it('works with afterEach', () => {
-    const result = runJest.json('jasmine_async', [
+    const result = runJest.json('jasmine-async', [
       'promise_after_each.test.js',
     ]);
     const json = result.json;
@@ -73,7 +73,7 @@ describe('async jasmine', () => {
   });
 
   it('works with fit', () => {
-    const result = runJest.json('jasmine_async', ['promise_fit.test.js']);
+    const result = runJest.json('jasmine-async', ['promise_fit.test.js']);
     const json = result.json;
 
     expect(json.numTotalTests).toBe(3);
@@ -84,7 +84,7 @@ describe('async jasmine', () => {
   });
 
   it('works with xit', () => {
-    const result = runJest.json('jasmine_async', ['promise_xit.test.js']);
+    const result = runJest.json('jasmine-async', ['promise_xit.test.js']);
     const json = result.json;
 
     expect(json.numTotalTests).toBe(2);
@@ -94,7 +94,7 @@ describe('async jasmine', () => {
   });
 
   it('throws when not a promise is returned', () => {
-    const result = runJest.json('jasmine_async', ['returning_values.test.js']);
+    const result = runJest.json('jasmine-async', ['returning_values.test.js']);
     const json = result.json;
 
     expect(json.numTotalTests).toBe(11);
@@ -104,7 +104,7 @@ describe('async jasmine', () => {
   });
 
   it('tests async promise code', () => {
-    const result = runJest.json('jasmine_async', ['promise_it.test.js']);
+    const result = runJest.json('jasmine-async', ['promise_it.test.js']);
     const json = result.json;
     const message = json.testResults[0].message;
 
@@ -124,7 +124,7 @@ describe('async jasmine', () => {
   });
 
   it('works with concurrent', () => {
-    const result = runJest.json('jasmine_async', ['concurrent.test.js']);
+    const result = runJest.json('jasmine-async', ['concurrent.test.js']);
     const json = result.json;
     expect(json.numTotalTests).toBe(4);
     expect(json.numPassedTests).toBe(2);
@@ -134,7 +134,7 @@ describe('async jasmine', () => {
   });
 
   it('async test fails', () => {
-    const result = runJest.json('jasmine_async', ['async_test_fails.test.js']);
+    const result = runJest.json('jasmine-async', ['async_test_fails.test.js']);
 
     expect(result.status).toBe(1);
     expect(result.json.testResults[0].message).toEqual(
@@ -143,7 +143,7 @@ describe('async jasmine', () => {
   });
 
   it('generator test', () => {
-    const result = runJest('jasmine_async', ['generator.test.js']);
+    const result = runJest('jasmine-async', ['generator.test.js']);
 
     expect(result.status).toBe(0);
   });
diff --git a/integration-tests/__tests__/json_reporter.test.js b/integration-tests/__tests__/json_reporter.test.js
index d9094b263f41..0cdc5b8475b9 100644
--- a/integration-tests/__tests__/json_reporter.test.js
+++ b/integration-tests/__tests__/json_reporter.test.js
@@ -16,7 +16,7 @@ describe('JSON Reporter', () => {
   const outputFileName = 'sum.result.json';
   const outputFilePath = path.join(
     process.cwd(),
-    'integration-tests/json_reporter/',
+    'integration-tests/json-reporter/',
     outputFileName,
   );
 
@@ -27,7 +27,7 @@ describe('JSON Reporter', () => {
   it('writes test result to sum.result.json', () => {
     let jsonResult;
 
-    runJest('json_reporter', ['--json', `--outputFile=${outputFileName}`]);
+    runJest('json-reporter', ['--json', `--outputFile=${outputFileName}`]);
     const testOutput = fs.readFileSync(outputFilePath, 'utf8');
 
     try {
@@ -65,7 +65,7 @@ describe('JSON Reporter', () => {
   });
 
   it('outputs coverage report', () => {
-    const result = runJest('json_reporter', ['--json']);
+    const result = runJest('json-reporter', ['--json']);
     const stdout = result.stdout.toString();
     const stderr = result.stderr.toString();
     let jsonResult;
diff --git a/integration-tests/__tests__/list_tests.test.js b/integration-tests/__tests__/list_tests.test.js
index 749de8512270..392ee1def18b 100644
--- a/integration-tests/__tests__/list_tests.test.js
+++ b/integration-tests/__tests__/list_tests.test.js
@@ -22,7 +22,7 @@ const normalizePaths = rawPaths =>
 
 describe('--listTests flag', () => {
   it('causes tests to be printed in different lines', () => {
-    const {status, stdout} = runJest('list_tests', ['--listTests']);
+    const {status, stdout} = runJest('list-tests', ['--listTests']);
 
     expect(status).toBe(0);
     expect(
@@ -34,7 +34,7 @@ describe('--listTests flag', () => {
   });
 
   it('causes tests to be printed out as JSON when using the --json flag', () => {
-    const {status, stdout} = runJest('list_tests', ['--listTests', '--json']);
+    const {status, stdout} = runJest('list-tests', ['--listTests', '--json']);
 
     expect(status).toBe(0);
     expect(() => JSON.parse(stdout)).not.toThrow();
diff --git a/integration-tests/__tests__/location_in_results.test.js b/integration-tests/__tests__/location_in_results.test.js
index d4903234a669..19891b542a1d 100644
--- a/integration-tests/__tests__/location_in_results.test.js
+++ b/integration-tests/__tests__/location_in_results.test.js
@@ -11,7 +11,7 @@
 const runJest = require('../runJest');
 
 it('defaults to null for location', () => {
-  const result = runJest.json('location_in_results').json;
+  const result = runJest.json('location-in-results').json;
 
   const assertions = result.testResults[0].assertionResults;
   expect(result.success).toBe(true);
@@ -21,7 +21,7 @@ it('defaults to null for location', () => {
 });
 
 it('adds correct location info when provided with flag', () => {
-  const result = runJest.json('location_in_results', [
+  const result = runJest.json('location-in-results', [
     '--testLocationInResults',
   ]).json;
 
diff --git a/integration-tests/__tests__/module_name_mapper.test.js b/integration-tests/__tests__/module_name_mapper.test.js
index 4298d240b833..83f5ade49068 100644
--- a/integration-tests/__tests__/module_name_mapper.test.js
+++ b/integration-tests/__tests__/module_name_mapper.test.js
@@ -16,7 +16,7 @@ const skipOnWindows = require('../../scripts/skip_on_windows');
 skipOnWindows.suite();
 
 test('moduleNameMapper wrong configuration', () => {
-  const {stderr, status} = runJest('module_name_mapper_wrong_config');
+  const {stderr, status} = runJest('module-name-mapper-wrong-config');
   const {rest} = extractSummary(stderr);
 
   expect(status).toBe(1);
@@ -24,7 +24,7 @@ test('moduleNameMapper wrong configuration', () => {
 });
 
 test('moduleNameMapper correct configuration', () => {
-  const {stderr, status} = runJest('module_name_mapper_correct_config');
+  const {stderr, status} = runJest('module-name-mapper-correct-config');
   const {rest} = extractSummary(stderr);
 
   expect(status).toBe(0);
diff --git a/integration-tests/__tests__/nested_event_loop.test.js b/integration-tests/__tests__/nested_event_loop.test.js
index a0d3e7a6b218..7f44bb9dad8b 100644
--- a/integration-tests/__tests__/nested_event_loop.test.js
+++ b/integration-tests/__tests__/nested_event_loop.test.js
@@ -11,6 +11,6 @@
 const runJest = require('../runJest');
 
 test('works with nested event loops', () => {
-  const result = runJest('nested_event_loop');
+  const result = runJest('nested-event-loop');
   expect(result.status).toBe(0);
 });
diff --git a/integration-tests/__tests__/no_test_found.test.js b/integration-tests/__tests__/no_test_found.test.js
index b98038d405c0..a330d2585b77 100644
--- a/integration-tests/__tests__/no_test_found.test.js
+++ b/integration-tests/__tests__/no_test_found.test.js
@@ -12,7 +12,7 @@ const runJest = require('../runJest');
 
 describe('Coverage Report', () => {
   it('outputs coverage report', () => {
-    const result = runJest('coverage_report', ['not-a-valid-test']);
+    const result = runJest('coverage-report', ['not-a-valid-test']);
     const stdout = result.stdout.toString();
 
     expect(stdout).toMatch('No tests found');
diff --git a/integration-tests/__tests__/no_tests_found.test.js b/integration-tests/__tests__/no_tests_found.test.js
index 5b24242a782b..38c9f90d965c 100644
--- a/integration-tests/__tests__/no_tests_found.test.js
+++ b/integration-tests/__tests__/no_tests_found.test.js
@@ -12,7 +12,7 @@
 const path = require('path');
 const runJest = require('../runJest');
 
-const DIR = path.resolve(__dirname, '../no_tests_found-test');
+const DIR = path.resolve(__dirname, '../no-tests-found-test');
 
 describe('No tests are found', () => {
   test('fails the test suite in standard situation', () => {
diff --git a/integration-tests/__tests__/node_path.test.js b/integration-tests/__tests__/node_path.test.js
index 2de052283120..7a06d20407b1 100644
--- a/integration-tests/__tests__/node_path.test.js
+++ b/integration-tests/__tests__/node_path.test.js
@@ -12,8 +12,8 @@ const runJest = require('../runJest');
 
 test('supports NODE_PATH', () => {
   // $FlowFixMe after adding @flow to this test this seems to be a real bug
-  const result = runJest('node_path', [], {
-    nodePath: ['../node_path/src'],
+  const result = runJest('node-path', [], {
+    nodePath: ['../node-path/src'],
   });
   expect(result.status).toBe(0);
 });
diff --git a/integration-tests/__tests__/set_immediate.test.js b/integration-tests/__tests__/set_immediate.test.js
index c600483a266a..a812eca9d273 100644
--- a/integration-tests/__tests__/set_immediate.test.js
+++ b/integration-tests/__tests__/set_immediate.test.js
@@ -11,7 +11,7 @@
 const runJest = require('../runJest');
 
 test('setImmediate', () => {
-  const result = runJest('set_immediate', ['--verbose']);
+  const result = runJest('set-immediate', ['--verbose']);
   const stderr = result.stderr.toString();
 
   expect(stderr).toMatch('setImmediate test');
diff --git a/integration-tests/__tests__/setup_test_framework_script_file_cli_config.test.js b/integration-tests/__tests__/setup_test_framework_script_file_cli_config.test.js
index b9ee0ac2cfd1..217709cba81d 100644
--- a/integration-tests/__tests__/setup_test_framework_script_file_cli_config.test.js
+++ b/integration-tests/__tests__/setup_test_framework_script_file_cli_config.test.js
@@ -12,7 +12,7 @@ const runJest = require('../runJest');
 
 describe('--setupTestFrameworkScriptFile setup.js', () => {
   it('requires a setup file before each file in the suite', () => {
-    const result = runJest.json('setup_test_framework_script_file_cli_config', [
+    const result = runJest.json('setup-test-framework-script-file-cli-config', [
       '--setupTestFrameworkScriptFile',
       './setup1.js',
       'test1.test.js',
@@ -26,7 +26,7 @@ describe('--setupTestFrameworkScriptFile setup.js', () => {
   });
 
   it('requires setup files *after* the test runners are required', () => {
-    const result = runJest.json('setup_test_framework_script_file_cli_config', [
+    const result = runJest.json('setup-test-framework-script-file-cli-config', [
       '--setupTestFrameworkScriptFile',
       './setup_hooks_into_runner.js',
       'runner_patch.test.js',
diff --git a/integration-tests/__tests__/stack_trace.test.js b/integration-tests/__tests__/stack_trace.test.js
index 7bf884b817c3..606ed05ff173 100644
--- a/integration-tests/__tests__/stack_trace.test.js
+++ b/integration-tests/__tests__/stack_trace.test.js
@@ -13,7 +13,7 @@ const {extractSummary} = require('../utils');
 
 describe('Stack Trace', () => {
   it('prints a stack trace for runtime errors', () => {
-    const result = runJest('stack_trace', ['runtime_error.test.js']);
+    const result = runJest('stack-trace', ['runtime_error.test.js']);
     const stderr = result.stderr.toString();
 
     expect(extractSummary(stderr).summary).toMatchSnapshot();
@@ -28,7 +28,7 @@ describe('Stack Trace', () => {
   });
 
   it('does not print a stack trace for runtime errors when --noStackTrace is given', () => {
-    const result = runJest('stack_trace', [
+    const result = runJest('stack-trace', [
       'runtime_error.test.js',
       '--noStackTrace',
     ]);
@@ -46,7 +46,7 @@ describe('Stack Trace', () => {
   });
 
   it('prints a stack trace for matching errors', () => {
-    const result = runJest('stack_trace', ['stack_trace.test.js']);
+    const result = runJest('stack-trace', ['stack_trace.test.js']);
     const stderr = result.stderr.toString();
 
     expect(extractSummary(stderr).summary).toMatchSnapshot();
@@ -56,7 +56,7 @@ describe('Stack Trace', () => {
   });
 
   it('does not print a stack trace for matching errors when --noStackTrace is given', () => {
-    const result = runJest('stack_trace', [
+    const result = runJest('stack-trace', [
       'stack_trace.test.js',
       '--noStackTrace',
     ]);
@@ -71,7 +71,7 @@ describe('Stack Trace', () => {
   });
 
   it('prints a stack trace for errors', () => {
-    const result = runJest('stack_trace', ['test_error.test.js']);
+    const result = runJest('stack-trace', ['test_error.test.js']);
     const stderr = result.stderr.toString();
 
     expect(extractSummary(stderr).summary).toMatchSnapshot();
@@ -93,7 +93,7 @@ describe('Stack Trace', () => {
   });
 
   it('prints a stack trace for errors without message in stack trace', () => {
-    const result = runJest('stack_trace', [
+    const result = runJest('stack-trace', [
       'stack_trace_without_message.test.js',
     ]);
     const stderr = result.stderr.toString();
@@ -108,7 +108,7 @@ describe('Stack Trace', () => {
   });
 
   it('does not print a stack trace for errors when --noStackTrace is given', () => {
-    const result = runJest('stack_trace', [
+    const result = runJest('stack-trace', [
       'test_error.test.js',
       '--noStackTrace',
     ]);
diff --git a/integration-tests/__tests__/stack_trace_no_captureStackTrace.test.js b/integration-tests/__tests__/stack_trace_no_captureStackTrace.test.js
index 1b6a38eb5307..6cd0865f1a09 100644
--- a/integration-tests/__tests__/stack_trace_no_captureStackTrace.test.js
+++ b/integration-tests/__tests__/stack_trace_no_captureStackTrace.test.js
@@ -11,7 +11,7 @@
 const runJest = require('../runJest');
 
 it('prints a usable stack trace even if no Error.captureStackTrace', () => {
-  const {stderr, status} = runJest('stack_trace_no_captureStackTrace');
+  const {stderr, status} = runJest('stack-trace-no-capture-stack-trace');
   expect(stderr).not.toMatch('Error.captureStackTrace is not a function');
   expect(status).toBe(1);
 });
diff --git a/integration-tests/__tests__/timer_reset_mocks.test.js b/integration-tests/__tests__/timer_reset_mocks.test.js
index 4da232c8da7e..4fd251bafbb2 100644
--- a/integration-tests/__tests__/timer_reset_mocks.test.js
+++ b/integration-tests/__tests__/timer_reset_mocks.test.js
@@ -11,11 +11,11 @@
 const runJest = require('../runJest');
 
 test('run timers after resetAllMocks test', () => {
-  const result = runJest('timer-resetMocks/after_resetAllMocks');
+  const result = runJest('timer-reset-mocks/after-reset-all-mocks');
   expect(result.status).toBe(0);
 });
 
 test('run timers with resetMocks in config test', () => {
-  const result = runJest('timer-resetMocks/with_resetMocks');
+  const result = runJest('timer-reset-mocks/with-reset-mocks');
   expect(result.status).toBe(0);
 });
diff --git a/integration-tests/__tests__/timer_use_real_timers.test.js b/integration-tests/__tests__/timer_use_real_timers.test.js
index d5dec023c8cd..53f4d511d452 100644
--- a/integration-tests/__tests__/timer_use_real_timers.test.js
+++ b/integration-tests/__tests__/timer_use_real_timers.test.js
@@ -11,7 +11,7 @@
 const runJest = require('../runJest');
 
 test('useRealTimers cancels "timers": "fake" for whole test file', () => {
-  const result = runJest('timer_use_real_timers');
+  const result = runJest('timer-use-real-timers');
   expect(result.stdout).toMatch('API is not mocked with fake timers.');
   expect(result.status).toBe(0);
 });
diff --git a/integration-tests/__tests__/verbose.test.js b/integration-tests/__tests__/verbose.test.js
index ef52ab47db22..77672577f9e0 100644
--- a/integration-tests/__tests__/verbose.test.js
+++ b/integration-tests/__tests__/verbose.test.js
@@ -11,7 +11,7 @@
 const runJest = require('../runJest');
 
 test('Verbose Reporter', () => {
-  const result = runJest('verbose_reporter');
+  const result = runJest('verbose-reporter');
   const stderr = result.stderr.toString();
 
   expect(result.status).toBe(1);
diff --git a/integration-tests/clear_cache/__tests__/clear_cache.test.js b/integration-tests/clear-cache/__tests__/clear_cache.test.js
similarity index 100%
rename from integration-tests/clear_cache/__tests__/clear_cache.test.js
rename to integration-tests/clear-cache/__tests__/clear_cache.test.js
diff --git a/integration-tests/clear_cache/package.json b/integration-tests/clear-cache/package.json
similarity index 100%
rename from integration-tests/clear_cache/package.json
rename to integration-tests/clear-cache/package.json
diff --git a/integration-tests/coverage_report/.gitignore b/integration-tests/coverage-report/.gitignore
similarity index 100%
rename from integration-tests/coverage_report/.gitignore
rename to integration-tests/coverage-report/.gitignore
diff --git a/integration-tests/coverage_report/__mocks__/sum_dependency.js b/integration-tests/coverage-report/__mocks__/sum_dependency.js
similarity index 100%
rename from integration-tests/coverage_report/__mocks__/sum_dependency.js
rename to integration-tests/coverage-report/__mocks__/sum_dependency.js
diff --git a/integration-tests/coverage_report/__tests__/sum.test.js b/integration-tests/coverage-report/__tests__/sum.test.js
similarity index 100%
rename from integration-tests/coverage_report/__tests__/sum.test.js
rename to integration-tests/coverage-report/__tests__/sum.test.js
diff --git a/integration-tests/coverage_report/cached-duplicates/a/__tests__/identical.test.js b/integration-tests/coverage-report/cached-duplicates/a/__tests__/identical.test.js
similarity index 100%
rename from integration-tests/coverage_report/cached-duplicates/a/__tests__/identical.test.js
rename to integration-tests/coverage-report/cached-duplicates/a/__tests__/identical.test.js
diff --git a/integration-tests/coverage_report/cached-duplicates/a/identical.js b/integration-tests/coverage-report/cached-duplicates/a/identical.js
similarity index 100%
rename from integration-tests/coverage_report/cached-duplicates/a/identical.js
rename to integration-tests/coverage-report/cached-duplicates/a/identical.js
diff --git a/integration-tests/coverage_report/cached-duplicates/b/__tests__/identical.test.js b/integration-tests/coverage-report/cached-duplicates/b/__tests__/identical.test.js
similarity index 100%
rename from integration-tests/coverage_report/cached-duplicates/b/__tests__/identical.test.js
rename to integration-tests/coverage-report/cached-duplicates/b/__tests__/identical.test.js
diff --git a/integration-tests/coverage_report/cached-duplicates/b/identical.js b/integration-tests/coverage-report/cached-duplicates/b/identical.js
similarity index 100%
rename from integration-tests/coverage_report/cached-duplicates/b/identical.js
rename to integration-tests/coverage-report/cached-duplicates/b/identical.js
diff --git a/integration-tests/coverage_report/not-required-in-test-suite.js b/integration-tests/coverage-report/not-required-in-test-suite.js
similarity index 100%
rename from integration-tests/coverage_report/not-required-in-test-suite.js
rename to integration-tests/coverage-report/not-required-in-test-suite.js
diff --git a/integration-tests/coverage_report/other-file.js b/integration-tests/coverage-report/other-file.js
similarity index 100%
rename from integration-tests/coverage_report/other-file.js
rename to integration-tests/coverage-report/other-file.js
diff --git a/integration-tests/coverage_report/package.json b/integration-tests/coverage-report/package.json
similarity index 100%
rename from integration-tests/coverage_report/package.json
rename to integration-tests/coverage-report/package.json
diff --git a/integration-tests/coverage_report/setup.js b/integration-tests/coverage-report/setup.js
similarity index 100%
rename from integration-tests/coverage_report/setup.js
rename to integration-tests/coverage-report/setup.js
diff --git a/integration-tests/coverage_report/sum.js b/integration-tests/coverage-report/sum.js
similarity index 100%
rename from integration-tests/coverage_report/sum.js
rename to integration-tests/coverage-report/sum.js
diff --git a/integration-tests/coverage_report/sum_dependency.js b/integration-tests/coverage-report/sum_dependency.js
similarity index 100%
rename from integration-tests/coverage_report/sum_dependency.js
rename to integration-tests/coverage-report/sum_dependency.js
diff --git a/integration-tests/custom_matcher_stack_trace/__tests__/custom_matcher.test.js b/integration-tests/custom-matcher-stack-trace/__tests__/custom_matcher.test.js
similarity index 100%
rename from integration-tests/custom_matcher_stack_trace/__tests__/custom_matcher.test.js
rename to integration-tests/custom-matcher-stack-trace/__tests__/custom_matcher.test.js
diff --git a/integration-tests/custom_matcher_stack_trace/package.json b/integration-tests/custom-matcher-stack-trace/package.json
similarity index 100%
rename from integration-tests/custom_matcher_stack_trace/package.json
rename to integration-tests/custom-matcher-stack-trace/package.json
diff --git a/integration-tests/custom_reporters/__tests__/add.test.js b/integration-tests/custom-reporters/__tests__/add.test.js
similarity index 100%
rename from integration-tests/custom_reporters/__tests__/add.test.js
rename to integration-tests/custom-reporters/__tests__/add.test.js
diff --git a/integration-tests/custom_reporters/__tests__/add_fail.test.js b/integration-tests/custom-reporters/__tests__/add_fail.test.js
similarity index 100%
rename from integration-tests/custom_reporters/__tests__/add_fail.test.js
rename to integration-tests/custom-reporters/__tests__/add_fail.test.js
diff --git a/integration-tests/custom_reporters/add.js b/integration-tests/custom-reporters/add.js
similarity index 100%
rename from integration-tests/custom_reporters/add.js
rename to integration-tests/custom-reporters/add.js
diff --git a/integration-tests/custom_reporters/package.json b/integration-tests/custom-reporters/package.json
similarity index 100%
rename from integration-tests/custom_reporters/package.json
rename to integration-tests/custom-reporters/package.json
diff --git a/integration-tests/custom_reporters/reporters/incomplete_reporter.js b/integration-tests/custom-reporters/reporters/incomplete_reporter.js
similarity index 100%
rename from integration-tests/custom_reporters/reporters/incomplete_reporter.js
rename to integration-tests/custom-reporters/reporters/incomplete_reporter.js
diff --git a/integration-tests/custom_reporters/reporters/test_reporter.js b/integration-tests/custom-reporters/reporters/test_reporter.js
similarity index 100%
rename from integration-tests/custom_reporters/reporters/test_reporter.js
rename to integration-tests/custom-reporters/reporters/test_reporter.js
diff --git a/integration-tests/empty_suite_error/__tests__/empty_suite.test.js b/integration-tests/empty-suite-error/__tests__/empty_suite.test.js
similarity index 100%
rename from integration-tests/empty_suite_error/__tests__/empty_suite.test.js
rename to integration-tests/empty-suite-error/__tests__/empty_suite.test.js
diff --git a/integration-tests/empty_suite_error/package.json b/integration-tests/empty-suite-error/package.json
similarity index 100%
rename from integration-tests/empty_suite_error/package.json
rename to integration-tests/empty-suite-error/package.json
diff --git a/integration-tests/global_setup/__tests__/setup1.test.js b/integration-tests/global-setup/__tests__/setup1.test.js
similarity index 90%
rename from integration-tests/global_setup/__tests__/setup1.test.js
rename to integration-tests/global-setup/__tests__/setup1.test.js
index 48b835b8fad4..45748982ba9b 100644
--- a/integration-tests/global_setup/__tests__/setup1.test.js
+++ b/integration-tests/global-setup/__tests__/setup1.test.js
@@ -10,7 +10,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_setup');
+const DIR = path.join(os.tmpdir(), 'jest-global-setup');
 
 test('should exist setup file', () => {
   const files = fs.readdirSync(DIR);
diff --git a/integration-tests/global_setup/__tests__/setup2.test.js b/integration-tests/global-setup/__tests__/setup2.test.js
similarity index 90%
rename from integration-tests/global_setup/__tests__/setup2.test.js
rename to integration-tests/global-setup/__tests__/setup2.test.js
index 48b835b8fad4..45748982ba9b 100644
--- a/integration-tests/global_setup/__tests__/setup2.test.js
+++ b/integration-tests/global-setup/__tests__/setup2.test.js
@@ -10,7 +10,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_setup');
+const DIR = path.join(os.tmpdir(), 'jest-global-setup');
 
 test('should exist setup file', () => {
   const files = fs.readdirSync(DIR);
diff --git a/integration-tests/global_setup/__tests__/setup3.test.js b/integration-tests/global-setup/__tests__/setup3.test.js
similarity index 90%
rename from integration-tests/global_setup/__tests__/setup3.test.js
rename to integration-tests/global-setup/__tests__/setup3.test.js
index 48b835b8fad4..45748982ba9b 100644
--- a/integration-tests/global_setup/__tests__/setup3.test.js
+++ b/integration-tests/global-setup/__tests__/setup3.test.js
@@ -10,7 +10,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_setup');
+const DIR = path.join(os.tmpdir(), 'jest-global-setup');
 
 test('should exist setup file', () => {
   const files = fs.readdirSync(DIR);
diff --git a/integration-tests/global_setup/package.json b/integration-tests/global-setup/package.json
similarity index 100%
rename from integration-tests/global_setup/package.json
rename to integration-tests/global-setup/package.json
diff --git a/integration-tests/global_setup/setup.js b/integration-tests/global-setup/setup.js
similarity index 91%
rename from integration-tests/global_setup/setup.js
rename to integration-tests/global-setup/setup.js
index d7acfdf5f0e3..a1bccb1b815d 100644
--- a/integration-tests/global_setup/setup.js
+++ b/integration-tests/global-setup/setup.js
@@ -10,7 +10,7 @@ const mkdirp = require('mkdirp');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_setup');
+const DIR = path.join(os.tmpdir(), 'jest-global-setup');
 
 module.exports = function() {
   return new Promise((resolve, reject) => {
diff --git a/integration-tests/global_teardown/__tests__/teardown1.test.js b/integration-tests/global-teardown/__tests__/teardown1.test.js
similarity index 87%
rename from integration-tests/global_teardown/__tests__/teardown1.test.js
rename to integration-tests/global-teardown/__tests__/teardown1.test.js
index a61e3352b8c8..3e05558051dd 100644
--- a/integration-tests/global_teardown/__tests__/teardown1.test.js
+++ b/integration-tests/global-teardown/__tests__/teardown1.test.js
@@ -10,7 +10,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_teardown');
+const DIR = path.join(os.tmpdir(), 'jest-global-teardown');
 
 test('should not exist teardown file', () => {
   const files = fs.readdirSync(DIR);
diff --git a/integration-tests/global_teardown/__tests__/teardown2.test.js b/integration-tests/global-teardown/__tests__/teardown2.test.js
similarity index 87%
rename from integration-tests/global_teardown/__tests__/teardown2.test.js
rename to integration-tests/global-teardown/__tests__/teardown2.test.js
index a61e3352b8c8..3e05558051dd 100644
--- a/integration-tests/global_teardown/__tests__/teardown2.test.js
+++ b/integration-tests/global-teardown/__tests__/teardown2.test.js
@@ -10,7 +10,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_teardown');
+const DIR = path.join(os.tmpdir(), 'jest-global-teardown');
 
 test('should not exist teardown file', () => {
   const files = fs.readdirSync(DIR);
diff --git a/integration-tests/global_teardown/__tests__/teardown3.test.js b/integration-tests/global-teardown/__tests__/teardown3.test.js
similarity index 87%
rename from integration-tests/global_teardown/__tests__/teardown3.test.js
rename to integration-tests/global-teardown/__tests__/teardown3.test.js
index a61e3352b8c8..3e05558051dd 100644
--- a/integration-tests/global_teardown/__tests__/teardown3.test.js
+++ b/integration-tests/global-teardown/__tests__/teardown3.test.js
@@ -10,7 +10,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_teardown');
+const DIR = path.join(os.tmpdir(), 'jest-global-teardown');
 
 test('should not exist teardown file', () => {
   const files = fs.readdirSync(DIR);
diff --git a/integration-tests/global_teardown/package.json b/integration-tests/global-teardown/package.json
similarity index 100%
rename from integration-tests/global_teardown/package.json
rename to integration-tests/global-teardown/package.json
diff --git a/integration-tests/global_teardown/teardown.js b/integration-tests/global-teardown/teardown.js
similarity index 90%
rename from integration-tests/global_teardown/teardown.js
rename to integration-tests/global-teardown/teardown.js
index a4757d0d57dc..f7d00cb0576c 100644
--- a/integration-tests/global_teardown/teardown.js
+++ b/integration-tests/global-teardown/teardown.js
@@ -10,7 +10,7 @@ const mkdirp = require('mkdirp');
 const os = require('os');
 const path = require('path');
 
-const DIR = path.join(os.tmpdir(), 'jest_global_teardown');
+const DIR = path.join(os.tmpdir(), 'jest-global-teardown');
 
 module.exports = function() {
   return new Promise((resolve, reject) => {
diff --git a/integration-tests/jasmine_async/__tests__/async_test_fails.test.js b/integration-tests/jasmine-async/__tests__/async_test_fails.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/async_test_fails.test.js
rename to integration-tests/jasmine-async/__tests__/async_test_fails.test.js
diff --git a/integration-tests/jasmine_async/__tests__/concurrent.test.js b/integration-tests/jasmine-async/__tests__/concurrent.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/concurrent.test.js
rename to integration-tests/jasmine-async/__tests__/concurrent.test.js
diff --git a/integration-tests/jasmine_async/__tests__/generator.test.js b/integration-tests/jasmine-async/__tests__/generator.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/generator.test.js
rename to integration-tests/jasmine-async/__tests__/generator.test.js
diff --git a/integration-tests/jasmine_async/__tests__/promise_after_all.test.js b/integration-tests/jasmine-async/__tests__/promise_after_all.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/promise_after_all.test.js
rename to integration-tests/jasmine-async/__tests__/promise_after_all.test.js
diff --git a/integration-tests/jasmine_async/__tests__/promise_after_each.test.js b/integration-tests/jasmine-async/__tests__/promise_after_each.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/promise_after_each.test.js
rename to integration-tests/jasmine-async/__tests__/promise_after_each.test.js
diff --git a/integration-tests/jasmine_async/__tests__/promise_before_all.test.js b/integration-tests/jasmine-async/__tests__/promise_before_all.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/promise_before_all.test.js
rename to integration-tests/jasmine-async/__tests__/promise_before_all.test.js
diff --git a/integration-tests/jasmine_async/__tests__/promise_before_each.test.js b/integration-tests/jasmine-async/__tests__/promise_before_each.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/promise_before_each.test.js
rename to integration-tests/jasmine-async/__tests__/promise_before_each.test.js
diff --git a/integration-tests/jasmine_async/__tests__/promise_fit.test.js b/integration-tests/jasmine-async/__tests__/promise_fit.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/promise_fit.test.js
rename to integration-tests/jasmine-async/__tests__/promise_fit.test.js
diff --git a/integration-tests/jasmine_async/__tests__/promise_it.test.js b/integration-tests/jasmine-async/__tests__/promise_it.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/promise_it.test.js
rename to integration-tests/jasmine-async/__tests__/promise_it.test.js
diff --git a/integration-tests/jasmine_async/__tests__/promise_xit.test.js b/integration-tests/jasmine-async/__tests__/promise_xit.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/promise_xit.test.js
rename to integration-tests/jasmine-async/__tests__/promise_xit.test.js
diff --git a/integration-tests/jasmine_async/__tests__/returning_values.test.js b/integration-tests/jasmine-async/__tests__/returning_values.test.js
similarity index 100%
rename from integration-tests/jasmine_async/__tests__/returning_values.test.js
rename to integration-tests/jasmine-async/__tests__/returning_values.test.js
diff --git a/integration-tests/jasmine_async/package.json b/integration-tests/jasmine-async/package.json
similarity index 100%
rename from integration-tests/jasmine_async/package.json
rename to integration-tests/jasmine-async/package.json
diff --git a/integration-tests/json_reporter/__tests__/sum.test.js b/integration-tests/json-reporter/__tests__/sum.test.js
similarity index 100%
rename from integration-tests/json_reporter/__tests__/sum.test.js
rename to integration-tests/json-reporter/__tests__/sum.test.js
diff --git a/integration-tests/json_reporter/package.json b/integration-tests/json-reporter/package.json
similarity index 100%
rename from integration-tests/json_reporter/package.json
rename to integration-tests/json-reporter/package.json
diff --git a/integration-tests/json_reporter/sum.js b/integration-tests/json-reporter/sum.js
similarity index 100%
rename from integration-tests/json_reporter/sum.js
rename to integration-tests/json-reporter/sum.js
diff --git a/integration-tests/list_tests/__tests__/dummy.test.js b/integration-tests/list-tests/__tests__/dummy.test.js
similarity index 100%
rename from integration-tests/list_tests/__tests__/dummy.test.js
rename to integration-tests/list-tests/__tests__/dummy.test.js
diff --git a/integration-tests/list_tests/__tests__/other.test.js b/integration-tests/list-tests/__tests__/other.test.js
similarity index 100%
rename from integration-tests/list_tests/__tests__/other.test.js
rename to integration-tests/list-tests/__tests__/other.test.js
diff --git a/integration-tests/list_tests/package.json b/integration-tests/list-tests/package.json
similarity index 100%
rename from integration-tests/list_tests/package.json
rename to integration-tests/list-tests/package.json
diff --git a/integration-tests/location_in_results/__tests__/test.js b/integration-tests/location-in-results/__tests__/test.js
similarity index 100%
rename from integration-tests/location_in_results/__tests__/test.js
rename to integration-tests/location-in-results/__tests__/test.js
diff --git a/integration-tests/location_in_results/package.json b/integration-tests/location-in-results/package.json
similarity index 100%
rename from integration-tests/location_in_results/package.json
rename to integration-tests/location-in-results/package.json
diff --git a/integration-tests/module_name_mapper_correct_config/__mocks__/style_mock.js b/integration-tests/module-name-mapper-correct-config/__mocks__/style_mock.js
similarity index 100%
rename from integration-tests/module_name_mapper_correct_config/__mocks__/style_mock.js
rename to integration-tests/module-name-mapper-correct-config/__mocks__/style_mock.js
diff --git a/integration-tests/module_name_mapper_correct_config/__tests__/index.js b/integration-tests/module-name-mapper-correct-config/__tests__/index.js
similarity index 100%
rename from integration-tests/module_name_mapper_correct_config/__tests__/index.js
rename to integration-tests/module-name-mapper-correct-config/__tests__/index.js
diff --git a/integration-tests/module_name_mapper_correct_config/index.js b/integration-tests/module-name-mapper-correct-config/index.js
similarity index 100%
rename from integration-tests/module_name_mapper_correct_config/index.js
rename to integration-tests/module-name-mapper-correct-config/index.js
diff --git a/integration-tests/module_name_mapper_correct_config/package.json b/integration-tests/module-name-mapper-correct-config/package.json
similarity index 100%
rename from integration-tests/module_name_mapper_correct_config/package.json
rename to integration-tests/module-name-mapper-correct-config/package.json
diff --git a/integration-tests/module_name_mapper_correct_config/style.css b/integration-tests/module-name-mapper-correct-config/style.css
similarity index 100%
rename from integration-tests/module_name_mapper_correct_config/style.css
rename to integration-tests/module-name-mapper-correct-config/style.css
diff --git a/integration-tests/module_name_mapper_wrong_config/__tests__/index.js b/integration-tests/module-name-mapper-wrong-config/__tests__/index.js
similarity index 100%
rename from integration-tests/module_name_mapper_wrong_config/__tests__/index.js
rename to integration-tests/module-name-mapper-wrong-config/__tests__/index.js
diff --git a/integration-tests/module_name_mapper_wrong_config/index.js b/integration-tests/module-name-mapper-wrong-config/index.js
similarity index 100%
rename from integration-tests/module_name_mapper_wrong_config/index.js
rename to integration-tests/module-name-mapper-wrong-config/index.js
diff --git a/integration-tests/module_name_mapper_wrong_config/package.json b/integration-tests/module-name-mapper-wrong-config/package.json
similarity index 100%
rename from integration-tests/module_name_mapper_wrong_config/package.json
rename to integration-tests/module-name-mapper-wrong-config/package.json
diff --git a/integration-tests/module_name_mapper_wrong_config/style.css b/integration-tests/module-name-mapper-wrong-config/style.css
similarity index 100%
rename from integration-tests/module_name_mapper_wrong_config/style.css
rename to integration-tests/module-name-mapper-wrong-config/style.css
diff --git a/integration-tests/nested_event_loop/__tests__/nested_event_loop.test.js b/integration-tests/nested-event-loop/__tests__/nested_event_loop.test.js
similarity index 100%
rename from integration-tests/nested_event_loop/__tests__/nested_event_loop.test.js
rename to integration-tests/nested-event-loop/__tests__/nested_event_loop.test.js
diff --git a/integration-tests/nested_event_loop/package.json b/integration-tests/nested-event-loop/package.json
similarity index 100%
rename from integration-tests/nested_event_loop/package.json
rename to integration-tests/nested-event-loop/package.json
diff --git a/integration-tests/no_tests_found-test/package.json b/integration-tests/no-tests-found-test/package.json
similarity index 100%
rename from integration-tests/no_tests_found-test/package.json
rename to integration-tests/no-tests-found-test/package.json
diff --git a/integration-tests/node_path/__tests__/node_path.test.js b/integration-tests/node-path/__tests__/node_path.test.js
similarity index 100%
rename from integration-tests/node_path/__tests__/node_path.test.js
rename to integration-tests/node-path/__tests__/node_path.test.js
diff --git a/integration-tests/node_path/package.json b/integration-tests/node-path/package.json
similarity index 100%
rename from integration-tests/node_path/package.json
rename to integration-tests/node-path/package.json
diff --git a/integration-tests/node_path/src/path/file.js b/integration-tests/node-path/src/path/file.js
similarity index 100%
rename from integration-tests/node_path/src/path/file.js
rename to integration-tests/node-path/src/path/file.js
diff --git a/integration-tests/set_immediate/__tests__/set_immediate.test.js b/integration-tests/set-immediate/__tests__/set_immediate.test.js
similarity index 100%
rename from integration-tests/set_immediate/__tests__/set_immediate.test.js
rename to integration-tests/set-immediate/__tests__/set_immediate.test.js
diff --git a/integration-tests/set_immediate/package.json b/integration-tests/set-immediate/package.json
similarity index 100%
rename from integration-tests/set_immediate/package.json
rename to integration-tests/set-immediate/package.json
diff --git a/integration-tests/setup_test_framework_script_file_cli_config/__tests__/runner_patch.test.js b/integration-tests/setup-test-framework-script-file-cli-config/__tests__/runner_patch.test.js
similarity index 100%
rename from integration-tests/setup_test_framework_script_file_cli_config/__tests__/runner_patch.test.js
rename to integration-tests/setup-test-framework-script-file-cli-config/__tests__/runner_patch.test.js
diff --git a/integration-tests/setup_test_framework_script_file_cli_config/__tests__/test1.test.js b/integration-tests/setup-test-framework-script-file-cli-config/__tests__/test1.test.js
similarity index 100%
rename from integration-tests/setup_test_framework_script_file_cli_config/__tests__/test1.test.js
rename to integration-tests/setup-test-framework-script-file-cli-config/__tests__/test1.test.js
diff --git a/integration-tests/setup_test_framework_script_file_cli_config/__tests__/test2.test.js b/integration-tests/setup-test-framework-script-file-cli-config/__tests__/test2.test.js
similarity index 100%
rename from integration-tests/setup_test_framework_script_file_cli_config/__tests__/test2.test.js
rename to integration-tests/setup-test-framework-script-file-cli-config/__tests__/test2.test.js
diff --git a/integration-tests/setup_test_framework_script_file_cli_config/package.json b/integration-tests/setup-test-framework-script-file-cli-config/package.json
similarity index 100%
rename from integration-tests/setup_test_framework_script_file_cli_config/package.json
rename to integration-tests/setup-test-framework-script-file-cli-config/package.json
diff --git a/integration-tests/setup_test_framework_script_file_cli_config/setup1.js b/integration-tests/setup-test-framework-script-file-cli-config/setup1.js
similarity index 100%
rename from integration-tests/setup_test_framework_script_file_cli_config/setup1.js
rename to integration-tests/setup-test-framework-script-file-cli-config/setup1.js
diff --git a/integration-tests/setup_test_framework_script_file_cli_config/setup_hooks_into_runner.js b/integration-tests/setup-test-framework-script-file-cli-config/setup_hooks_into_runner.js
similarity index 100%
rename from integration-tests/setup_test_framework_script_file_cli_config/setup_hooks_into_runner.js
rename to integration-tests/setup-test-framework-script-file-cli-config/setup_hooks_into_runner.js
diff --git a/integration-tests/stack_trace_no_captureStackTrace/__tests__/runtime_error.test.js b/integration-tests/stack-trace-no-capture-stack-trace/__tests__/runtime_error.test.js
similarity index 100%
rename from integration-tests/stack_trace_no_captureStackTrace/__tests__/runtime_error.test.js
rename to integration-tests/stack-trace-no-capture-stack-trace/__tests__/runtime_error.test.js
diff --git a/integration-tests/stack_trace/package.json b/integration-tests/stack-trace-no-capture-stack-trace/package.json
similarity index 100%
rename from integration-tests/stack_trace/package.json
rename to integration-tests/stack-trace-no-capture-stack-trace/package.json
diff --git a/integration-tests/stack_trace/__tests__/runtime_error.test.js b/integration-tests/stack-trace/__tests__/runtime_error.test.js
similarity index 100%
rename from integration-tests/stack_trace/__tests__/runtime_error.test.js
rename to integration-tests/stack-trace/__tests__/runtime_error.test.js
diff --git a/integration-tests/stack_trace/__tests__/stack_trace.test.js b/integration-tests/stack-trace/__tests__/stack_trace.test.js
similarity index 100%
rename from integration-tests/stack_trace/__tests__/stack_trace.test.js
rename to integration-tests/stack-trace/__tests__/stack_trace.test.js
diff --git a/integration-tests/stack_trace/__tests__/stack_trace_without_message.test.js b/integration-tests/stack-trace/__tests__/stack_trace_without_message.test.js
similarity index 100%
rename from integration-tests/stack_trace/__tests__/stack_trace_without_message.test.js
rename to integration-tests/stack-trace/__tests__/stack_trace_without_message.test.js
diff --git a/integration-tests/stack_trace/__tests__/test_error.test.js b/integration-tests/stack-trace/__tests__/test_error.test.js
similarity index 100%
rename from integration-tests/stack_trace/__tests__/test_error.test.js
rename to integration-tests/stack-trace/__tests__/test_error.test.js
diff --git a/integration-tests/stack_trace_no_captureStackTrace/package.json b/integration-tests/stack-trace/package.json
similarity index 100%
rename from integration-tests/stack_trace_no_captureStackTrace/package.json
rename to integration-tests/stack-trace/package.json
diff --git a/integration-tests/timer-resetMocks/after_resetAllMocks/index.js b/integration-tests/timer-reset-mocks/after-reset-all-mocks/index.js
similarity index 100%
rename from integration-tests/timer-resetMocks/after_resetAllMocks/index.js
rename to integration-tests/timer-reset-mocks/after-reset-all-mocks/index.js
diff --git a/integration-tests/timer-resetMocks/after_resetAllMocks/package.json b/integration-tests/timer-reset-mocks/after-reset-all-mocks/package.json
similarity index 100%
rename from integration-tests/timer-resetMocks/after_resetAllMocks/package.json
rename to integration-tests/timer-reset-mocks/after-reset-all-mocks/package.json
diff --git a/integration-tests/timer-resetMocks/after_resetAllMocks/timer_and_mock.test.js b/integration-tests/timer-reset-mocks/after-reset-all-mocks/timer_and_mock.test.js
similarity index 100%
rename from integration-tests/timer-resetMocks/after_resetAllMocks/timer_and_mock.test.js
rename to integration-tests/timer-reset-mocks/after-reset-all-mocks/timer_and_mock.test.js
diff --git a/integration-tests/timer-resetMocks/with_resetMocks/index.js b/integration-tests/timer-reset-mocks/with-reset-mocks/index.js
similarity index 100%
rename from integration-tests/timer-resetMocks/with_resetMocks/index.js
rename to integration-tests/timer-reset-mocks/with-reset-mocks/index.js
diff --git a/integration-tests/timer-resetMocks/with_resetMocks/package.json b/integration-tests/timer-reset-mocks/with-reset-mocks/package.json
similarity index 100%
rename from integration-tests/timer-resetMocks/with_resetMocks/package.json
rename to integration-tests/timer-reset-mocks/with-reset-mocks/package.json
diff --git a/integration-tests/timer-resetMocks/with_resetMocks/timer_with_mock.test.js b/integration-tests/timer-reset-mocks/with-reset-mocks/timer_with_mock.test.js
similarity index 100%
rename from integration-tests/timer-resetMocks/with_resetMocks/timer_with_mock.test.js
rename to integration-tests/timer-reset-mocks/with-reset-mocks/timer_with_mock.test.js
diff --git a/integration-tests/timer_use_real_timers/__tests__/use_real_timers.test.js b/integration-tests/timer-use-real-timers/__tests__/use_real_timers.test.js
similarity index 100%
rename from integration-tests/timer_use_real_timers/__tests__/use_real_timers.test.js
rename to integration-tests/timer-use-real-timers/__tests__/use_real_timers.test.js
diff --git a/integration-tests/timer_use_real_timers/package.json b/integration-tests/timer-use-real-timers/package.json
similarity index 100%
rename from integration-tests/timer_use_real_timers/package.json
rename to integration-tests/timer-use-real-timers/package.json
diff --git a/integration-tests/verbose_reporter/__tests__/verbose.test.js b/integration-tests/verbose-reporter/__tests__/verbose.test.js
similarity index 100%
rename from integration-tests/verbose_reporter/__tests__/verbose.test.js
rename to integration-tests/verbose-reporter/__tests__/verbose.test.js
diff --git a/integration-tests/verbose_reporter/package.json b/integration-tests/verbose-reporter/package.json
similarity index 100%
rename from integration-tests/verbose_reporter/package.json
rename to integration-tests/verbose-reporter/package.json