diff --git a/test/integration/jw-pkg/Makefile b/test/integration/jw_pkg/Makefile
similarity index 100%
rename from test/integration/jw-pkg/Makefile
rename to test/integration/jw_pkg/Makefile
diff --git a/test/integration/jw-pkg/help/Makefile b/test/integration/jw_pkg/help/Makefile
similarity index 100%
rename from test/integration/jw-pkg/help/Makefile
rename to test/integration/jw_pkg/help/Makefile
diff --git a/test/integration/jw-pkg/help/test-expected.txt b/test/integration/jw_pkg/help/test-expected.txt
similarity index 100%
rename from test/integration/jw-pkg/help/test-expected.txt
rename to test/integration/jw_pkg/help/test-expected.txt
diff --git a/test/integration/jw-pkg/help/test.sh b/test/integration/jw_pkg/help/test.sh
similarity index 100%
rename from test/integration/jw-pkg/help/test.sh
rename to test/integration/jw_pkg/help/test.sh
diff --git a/test/integration/jw-pkg/packages/Makefile b/test/integration/jw_pkg/packages/Makefile
similarity index 100%
rename from test/integration/jw-pkg/packages/Makefile
rename to test/integration/jw_pkg/packages/Makefile
diff --git a/test/integration/jw-pkg/packages/ls/Makefile b/test/integration/jw_pkg/packages/ls/Makefile
similarity index 100%
rename from test/integration/jw-pkg/packages/ls/Makefile
rename to test/integration/jw_pkg/packages/ls/Makefile
diff --git a/test/integration/jw-pkg/packages/ls/test.out.expected b/test/integration/jw_pkg/packages/ls/test.out.expected
similarity index 100%
rename from test/integration/jw-pkg/packages/ls/test.out.expected
rename to test/integration/jw_pkg/packages/ls/test.out.expected
diff --git a/test/integration/jw-pkg/projects/Makefile b/test/integration/jw_pkg/projects/Makefile
similarity index 100%
rename from test/integration/jw-pkg/projects/Makefile
rename to test/integration/jw_pkg/projects/Makefile
diff --git a/test/integration/jw-pkg/projects/cache/Makefile b/test/integration/jw_pkg/projects/cache/Makefile
similarity index 100%
rename from test/integration/jw-pkg/projects/cache/Makefile
rename to test/integration/jw_pkg/projects/cache/Makefile
diff --git a/test/integration/jw-pkg/projects/create-file/Makefile b/test/integration/jw_pkg/projects/create-file/Makefile
similarity index 100%
rename from test/integration/jw-pkg/projects/create-file/Makefile
rename to test/integration/jw_pkg/projects/create-file/Makefile
diff --git a/test/integration/jw-pkg/projects/create-file/templates/basic.tmpl b/test/integration/jw_pkg/projects/create-file/templates/basic.tmpl
similarity index 100%
rename from test/integration/jw-pkg/projects/create-file/templates/basic.tmpl
rename to test/integration/jw_pkg/projects/create-file/templates/basic.tmpl
diff --git a/test/integration/jw-pkg/projects/create-file/templates/list.tmpl b/test/integration/jw_pkg/projects/create-file/templates/list.tmpl
similarity index 100%
rename from test/integration/jw-pkg/projects/create-file/templates/list.tmpl
rename to test/integration/jw_pkg/projects/create-file/templates/list.tmpl
diff --git a/test/integration/jw-pkg/projects/create-file/test-expected.txt b/test/integration/jw_pkg/projects/create-file/test-expected.txt
similarity index 100%
rename from test/integration/jw-pkg/projects/create-file/test-expected.txt
rename to test/integration/jw_pkg/projects/create-file/test-expected.txt
diff --git a/test/integration/jw-pkg/projects/create-file/test.sh b/test/integration/jw_pkg/projects/create-file/test.sh
similarity index 100%
rename from test/integration/jw-pkg/projects/create-file/test.sh
rename to test/integration/jw_pkg/projects/create-file/test.sh
diff --git a/test/integration/jw-pkg/projects/create-pkg-config/Makefile b/test/integration/jw_pkg/projects/create-pkg-config/Makefile
similarity index 100%
rename from test/integration/jw-pkg/projects/create-pkg-config/Makefile
rename to test/integration/jw_pkg/projects/create-pkg-config/Makefile
diff --git a/test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt b/test/integration/jw_pkg/projects/create-pkg-config/test-expected.txt
similarity index 100%
rename from test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt
rename to test/integration/jw_pkg/projects/create-pkg-config/test-expected.txt
diff --git a/test/integration/jw-pkg/projects/create-pkg-config/test.sh b/test/integration/jw_pkg/projects/create-pkg-config/test.sh
similarity index 100%
rename from test/integration/jw-pkg/projects/create-pkg-config/test.sh
rename to test/integration/jw_pkg/projects/create-pkg-config/test.sh
diff --git a/test/integration/jw-pkg/projects/pkg-requires/Makefile b/test/integration/jw_pkg/projects/pkg-requires/Makefile
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/Makefile
rename to test/integration/jw_pkg/projects/pkg-requires/Makefile
diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/VERSION b/test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/VERSION
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/VERSION
rename to test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/VERSION
diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/make/project.conf b/test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/make/project.conf
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/make/project.conf
rename to test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/make/project.conf
diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/VERSION b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/VERSION
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/VERSION
rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/VERSION
diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/make/project.conf b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/make/project.conf
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/make/project.conf
rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/make/project.conf
diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/VERSION b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/VERSION
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/VERSION
rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/VERSION
diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/make/project.conf b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/make/project.conf
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/make/project.conf
rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/make/project.conf
diff --git a/test/integration/jw-pkg/projects/pkg-requires/test-expected.txt b/test/integration/jw_pkg/projects/pkg-requires/test-expected.txt
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/test-expected.txt
rename to test/integration/jw_pkg/projects/pkg-requires/test-expected.txt
diff --git a/test/integration/jw-pkg/projects/pkg-requires/test.sh b/test/integration/jw_pkg/projects/pkg-requires/test.sh
similarity index 100%
rename from test/integration/jw-pkg/projects/pkg-requires/test.sh
rename to test/integration/jw_pkg/projects/pkg-requires/test.sh
diff --git a/test/integration/jw-pkg/secrets/Makefile b/test/integration/jw_pkg/secrets/Makefile
similarity index 100%
rename from test/integration/jw-pkg/secrets/Makefile
rename to test/integration/jw_pkg/secrets/Makefile
diff --git a/test/integration/jw-pkg/secrets/runme.py b/test/integration/jw_pkg/secrets/test.py
similarity index 100%
rename from test/integration/jw-pkg/secrets/runme.py
rename to test/integration/jw_pkg/secrets/test.py