diff --git a/.codacy.yml b/.codacy.yml index a75ac73e732..8f69c088a6b 100644 --- a/.codacy.yml +++ b/.codacy.yml @@ -2,6 +2,5 @@ exclude_paths: - 'conf/**' - 'doc/joss-paper/**' - 'etc/**' - - 'cylc/flow/tests/**' - 'tests/**' - 'cylc/flow/**_pb2.py' diff --git a/.codecov.yml b/.codecov.yml index 9b3c8ac9fec..426a38f6322 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -40,7 +40,7 @@ coverage: # files to ignore ignore: - - "tests/**/*.py" + - "tests/**" - "ws_messages_pb2.py" # turn off comments to pull requests diff --git a/.coveragerc b/.coveragerc index e12324907eb..9ddd405b1cd 100644 --- a/.coveragerc +++ b/.coveragerc @@ -29,11 +29,10 @@ debug= #include note= omit= - */cylc/flow/tests/* + tests/* */cylc/flow/profiler.py */cylc/flow/profiling/* */cylc/flow/parsec/OrderedDictCompat.py - */cylc/flow/parsec/tests/* */cylc/flow/*_pb2.py parallel = True plugins= @@ -55,11 +54,10 @@ fail_under=0 ignore_errors = False include= omit= - */cylc/flow/tests/* + tests/* */cylc/flow/profiler.py */cylc/flow/profiling/* */cylc/flow/parsec/OrderedDictCompat.py - */cylc/flow/parsec/tests/* */cylc/flow/*_pb2.py partial_branches= precision=2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1142dc1a8d0..01c1a857f2b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,11 +43,11 @@ jobs: matrix: python-version: ['3.7'] tests: [ - ['tests', '1/4'], - ['tests', '2/4'], - ['tests', '3/4'], - ['tests', '4/4'], - ['flakytests', '1/1'] + ['tests/f', '1/4'], + ['tests/f', '2/4'], + ['tests/f', '3/4'], + ['tests/f', '4/4'], + ['tests/k', '1/1'] ] env: BASE: ${{ matrix.tests[0] }} @@ -72,7 +72,7 @@ jobs: - name: Test run: | - if [[ "${BASE}" == 'flakytests' ]]; then + if [[ "${BASE}" == 'tests/k' ]]; then NPROC=4 else NPROC=8 diff --git a/cylc/flow/hostuserutil.py b/cylc/flow/hostuserutil.py index 1b0bfc37db1..73d5c9f9857 100644 --- a/cylc/flow/hostuserutil.py +++ b/cylc/flow/hostuserutil.py @@ -113,7 +113,7 @@ def _get_host_info(self, target=None): """Return the extended info of the current host.""" if target not in self._host_exs: if target is None: - target = socket.getfqdn() + target = socket.gethostname() try: self._host_exs[target] = socket.gethostbyname_ex(target) except IOError as exc: diff --git a/etc/bin/run-functional-tests b/etc/bin/run-functional-tests index f957f79743c..0e913169aca 100755 --- a/etc/bin/run-functional-tests +++ b/etc/bin/run-functional-tests @@ -22,7 +22,7 @@ Usage: run-functional-tests [...] Run the Cylc test battery, in /tests. -Options and arguments are appended to "prove -j \$NPROC -s -r \${@:-tests}". +Options and arguments are appended to "prove -j \$NPROC -s -r \${@:-tests/f}". NPROC is the number of concurrent processes to run, which defaults to the global config "process pool size" setting. @@ -68,13 +68,13 @@ Run the full test suite with the default options. run-functional-tests Run the full test suite with 12 processes run-functional-tests -j 12 -Run only tests under "tests/cyclers/" - run-functional-tests tests/cyclers -Run only "tests/cyclers/16-weekly.t" in verbose mode - run-functional-tests -v tests/cyclers/16-weekly.t -Run only tests under "tests/cyclers/", and skip 00-daily.t - export CYLC_TEST_SKIP=tests/cyclers/00-daily.t - run-functional-tests tests/cyclers +Run only tests under "tests/f/cyclers/" + run-functional-tests tests/f/cyclers +Run only "tests/f/cyclers/16-weekly.t" in verbose mode + run-functional-tests -v tests/f/cyclers/16-weekly.t +Run only tests under "tests/f/cyclers/", and skip 00-daily.t + export CYLC_TEST_SKIP=tests/f/cyclers/00-daily.t + run-functional-tests tests/f/cyclers Run the first quarter of the test battery CHUNK=1/4 run-functional-tests Re-run failed tests @@ -125,7 +125,7 @@ export CYLC_REPO_DIR="${PWD}" # default test base if [[ ${#TESTS[@]} -eq 0 ]]; then - TESTS=('tests') + TESTS=('tests/functional') fi # handle chunking diff --git a/etc/bin/shellchecker b/etc/bin/shellchecker index d2a1934a3b7..7692afa02e6 100755 --- a/etc/bin/shellchecker +++ b/etc/bin/shellchecker @@ -76,7 +76,7 @@ default () { # run a strict check on all "functional" scripts main '.' \ --exclude 'etc/bin/live-graph-movie.sh' \ - --exclude 'tests/jobscript/00-torture/foo.ref-jobfile' \ + --exclude 'tests/functional/jobscript/00-torture/foo.ref-jobfile' \ -- -e SC1090 } diff --git a/etc/cylc-tests.rst b/etc/cylc-tests.rst deleted file mode 100644 index bb3344d8716..00000000000 --- a/etc/cylc-tests.rst +++ /dev/null @@ -1,46 +0,0 @@ -.. _RTAST: - -Automated Tests ---------------- - -For development purposes there are four sets of tests: - -Unittests - Fast to run Python unittests. - - Location - ``cylc/flow/tests`` - Configuration - ``pytest.ini`` - Execution - .. code-block:: console - - $ pytest - -Regression (functional) Tests - Large scale integration tests of the whole Cylc machinary. - - Location - * ``tests/`` - * ``flakytests/`` - Execution - .. code-block:: console - - $ bin/run-functional-tests DIR - - .. note:: - - Some test failures can be expected to result from suites timing out, - even if nothing is wrong, if you run too many tests in parallel. See - ``bin/run-functional-tests --help``. - -Code Style Tests - Tests to ensure the codebase conforms to code style. - - Execution - .. code-block:: console - - $ pycodestyle --ignore=E402,W503,W504 \ - cylc/flow \ - $(grep -l '#!.*\' bin/*) - $ etc/bin/shellchecker diff --git a/pytest.ini b/pytest.ini index f0c577b6e84..8e5af2dcee7 100644 --- a/pytest.ini +++ b/pytest.ini @@ -22,10 +22,9 @@ addopts = --verbose --ignore=cylc/flow/parsec/empysupport.py --ignore=cylc/flow/parsec/validate.py --ignore=cylc/flow/parsec/example - --ignore=cylc/flow/tests/parsec/getcfg/bin/one-line.py - --ignore=cylc/flow/tests/parsec/synonyms/bin/synonyms.py - --ignore=cylc/flow/tests/parsec/nullcfg/bin/empty.py + --ignore=tests/unit/parsec/getcfg/bin/one-line.py + --ignore=tests/unit/parsec/synonyms/bin/synonyms.py + --ignore=tests/unit/parsec/nullcfg/bin/empty.py --ignore=cylc/flow/data_messages_pb2.py testpaths = - cylc/flow/ - tests/lib/python/ + tests/unit/ diff --git a/tests/README b/tests/README deleted file mode 100644 index ecd8a0b4242..00000000000 --- a/tests/README +++ /dev/null @@ -1,2 +0,0 @@ -Cylc functional test battery. See: - etc/bin/run-functional-tests --help diff --git a/tests/f b/tests/f new file mode 120000 index 00000000000..de2cd13a8d0 --- /dev/null +++ b/tests/f @@ -0,0 +1 @@ +functional/ \ No newline at end of file diff --git a/flakytests/README.md b/tests/flakyfunctional/README.md similarity index 100% rename from flakytests/README.md rename to tests/flakyfunctional/README.md diff --git a/flakytests/cyclers/19-async_integer.t b/tests/flakyfunctional/cyclers/19-async_integer.t similarity index 100% rename from flakytests/cyclers/19-async_integer.t rename to tests/flakyfunctional/cyclers/19-async_integer.t diff --git a/flakytests/cyclers/19-async_integer/graph.plain.ref b/tests/flakyfunctional/cyclers/19-async_integer/graph.plain.ref similarity index 100% rename from flakytests/cyclers/19-async_integer/graph.plain.ref rename to tests/flakyfunctional/cyclers/19-async_integer/graph.plain.ref diff --git a/flakytests/cyclers/19-async_integer/reference.log b/tests/flakyfunctional/cyclers/19-async_integer/reference.log similarity index 100% rename from flakytests/cyclers/19-async_integer/reference.log rename to tests/flakyfunctional/cyclers/19-async_integer/reference.log diff --git a/flakytests/cyclers/19-async_integer/suite.rc b/tests/flakyfunctional/cyclers/19-async_integer/suite.rc similarity index 100% rename from flakytests/cyclers/19-async_integer/suite.rc rename to tests/flakyfunctional/cyclers/19-async_integer/suite.rc diff --git a/flakytests/cyclers/30-r1_at_icp_or.t b/tests/flakyfunctional/cyclers/30-r1_at_icp_or.t similarity index 100% rename from flakytests/cyclers/30-r1_at_icp_or.t rename to tests/flakyfunctional/cyclers/30-r1_at_icp_or.t diff --git a/flakytests/cyclers/30-r1_at_icp_or/graph.plain.ref b/tests/flakyfunctional/cyclers/30-r1_at_icp_or/graph.plain.ref similarity index 100% rename from flakytests/cyclers/30-r1_at_icp_or/graph.plain.ref rename to tests/flakyfunctional/cyclers/30-r1_at_icp_or/graph.plain.ref diff --git a/flakytests/cyclers/30-r1_at_icp_or/reference.log b/tests/flakyfunctional/cyclers/30-r1_at_icp_or/reference.log similarity index 100% rename from flakytests/cyclers/30-r1_at_icp_or/reference.log rename to tests/flakyfunctional/cyclers/30-r1_at_icp_or/reference.log diff --git a/flakytests/cyclers/30-r1_at_icp_or/suite.rc b/tests/flakyfunctional/cyclers/30-r1_at_icp_or/suite.rc similarity index 100% rename from flakytests/cyclers/30-r1_at_icp_or/suite.rc rename to tests/flakyfunctional/cyclers/30-r1_at_icp_or/suite.rc diff --git a/flakytests/cyclers/test_header b/tests/flakyfunctional/cyclers/test_header similarity index 100% rename from flakytests/cyclers/test_header rename to tests/flakyfunctional/cyclers/test_header diff --git a/flakytests/cylc-get-config/04-dummy-mode-output.t b/tests/flakyfunctional/cylc-get-config/04-dummy-mode-output.t similarity index 100% rename from flakytests/cylc-get-config/04-dummy-mode-output.t rename to tests/flakyfunctional/cylc-get-config/04-dummy-mode-output.t diff --git a/flakytests/cylc-get-config/04-dummy-mode-output/reference.log b/tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/reference.log similarity index 100% rename from flakytests/cylc-get-config/04-dummy-mode-output/reference.log rename to tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/reference.log diff --git a/flakytests/cylc-get-config/04-dummy-mode-output/suite.rc b/tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/suite.rc similarity index 100% rename from flakytests/cylc-get-config/04-dummy-mode-output/suite.rc rename to tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/suite.rc diff --git a/flakytests/cylc-get-config/test_header b/tests/flakyfunctional/cylc-get-config/test_header similarity index 100% rename from flakytests/cylc-get-config/test_header rename to tests/flakyfunctional/cylc-get-config/test_header diff --git a/flakytests/cylc-kill/02-submitted.t b/tests/flakyfunctional/cylc-kill/02-submitted.t similarity index 100% rename from flakytests/cylc-kill/02-submitted.t rename to tests/flakyfunctional/cylc-kill/02-submitted.t diff --git a/flakytests/cylc-kill/02-submitted/reference.log b/tests/flakyfunctional/cylc-kill/02-submitted/reference.log similarity index 100% rename from flakytests/cylc-kill/02-submitted/reference.log rename to tests/flakyfunctional/cylc-kill/02-submitted/reference.log diff --git a/flakytests/cylc-kill/02-submitted/suite.rc b/tests/flakyfunctional/cylc-kill/02-submitted/suite.rc similarity index 100% rename from flakytests/cylc-kill/02-submitted/suite.rc rename to tests/flakyfunctional/cylc-kill/02-submitted/suite.rc diff --git a/flakytests/cylc-kill/test_header b/tests/flakyfunctional/cylc-kill/test_header similarity index 100% rename from flakytests/cylc-kill/test_header rename to tests/flakyfunctional/cylc-kill/test_header diff --git a/flakytests/cylc-poll/03-poll-all.t b/tests/flakyfunctional/cylc-poll/03-poll-all.t similarity index 100% rename from flakytests/cylc-poll/03-poll-all.t rename to tests/flakyfunctional/cylc-poll/03-poll-all.t diff --git a/flakytests/cylc-poll/03-poll-all/reference.log b/tests/flakyfunctional/cylc-poll/03-poll-all/reference.log similarity index 100% rename from flakytests/cylc-poll/03-poll-all/reference.log rename to tests/flakyfunctional/cylc-poll/03-poll-all/reference.log diff --git a/flakytests/cylc-poll/03-poll-all/suite.rc b/tests/flakyfunctional/cylc-poll/03-poll-all/suite.rc similarity index 100% rename from flakytests/cylc-poll/03-poll-all/suite.rc rename to tests/flakyfunctional/cylc-poll/03-poll-all/suite.rc diff --git a/flakytests/cylc-poll/16-execution-time-limit.t b/tests/flakyfunctional/cylc-poll/16-execution-time-limit.t similarity index 100% rename from flakytests/cylc-poll/16-execution-time-limit.t rename to tests/flakyfunctional/cylc-poll/16-execution-time-limit.t diff --git a/flakytests/cylc-poll/16-execution-time-limit/reference.log b/tests/flakyfunctional/cylc-poll/16-execution-time-limit/reference.log similarity index 100% rename from flakytests/cylc-poll/16-execution-time-limit/reference.log rename to tests/flakyfunctional/cylc-poll/16-execution-time-limit/reference.log diff --git a/flakytests/cylc-poll/16-execution-time-limit/suite.rc b/tests/flakyfunctional/cylc-poll/16-execution-time-limit/suite.rc similarity index 100% rename from flakytests/cylc-poll/16-execution-time-limit/suite.rc rename to tests/flakyfunctional/cylc-poll/16-execution-time-limit/suite.rc diff --git a/flakytests/cylc-poll/test_header b/tests/flakyfunctional/cylc-poll/test_header similarity index 100% rename from flakytests/cylc-poll/test_header rename to tests/flakyfunctional/cylc-poll/test_header diff --git a/flakytests/cylc-reset/02-output-1.t b/tests/flakyfunctional/cylc-reset/02-output-1.t similarity index 100% rename from flakytests/cylc-reset/02-output-1.t rename to tests/flakyfunctional/cylc-reset/02-output-1.t diff --git a/flakytests/cylc-reset/02-output-1/reference.log b/tests/flakyfunctional/cylc-reset/02-output-1/reference.log similarity index 100% rename from flakytests/cylc-reset/02-output-1/reference.log rename to tests/flakyfunctional/cylc-reset/02-output-1/reference.log diff --git a/flakytests/cylc-reset/02-output-1/suite.rc b/tests/flakyfunctional/cylc-reset/02-output-1/suite.rc similarity index 100% rename from flakytests/cylc-reset/02-output-1/suite.rc rename to tests/flakyfunctional/cylc-reset/02-output-1/suite.rc diff --git a/flakytests/cylc-reset/03-output-2.t b/tests/flakyfunctional/cylc-reset/03-output-2.t similarity index 100% rename from flakytests/cylc-reset/03-output-2.t rename to tests/flakyfunctional/cylc-reset/03-output-2.t diff --git a/flakytests/cylc-reset/03-output-2/reference.log b/tests/flakyfunctional/cylc-reset/03-output-2/reference.log similarity index 100% rename from flakytests/cylc-reset/03-output-2/reference.log rename to tests/flakyfunctional/cylc-reset/03-output-2/reference.log diff --git a/flakytests/cylc-reset/03-output-2/suite.rc b/tests/flakyfunctional/cylc-reset/03-output-2/suite.rc similarity index 100% rename from flakytests/cylc-reset/03-output-2/suite.rc rename to tests/flakyfunctional/cylc-reset/03-output-2/suite.rc diff --git a/flakytests/cylc-reset/test_header b/tests/flakyfunctional/cylc-reset/test_header similarity index 100% rename from flakytests/cylc-reset/test_header rename to tests/flakyfunctional/cylc-reset/test_header diff --git a/flakytests/cylc-show/00-simple.t b/tests/flakyfunctional/cylc-show/00-simple.t similarity index 100% rename from flakytests/cylc-show/00-simple.t rename to tests/flakyfunctional/cylc-show/00-simple.t diff --git a/flakytests/cylc-show/00-simple/reference.log b/tests/flakyfunctional/cylc-show/00-simple/reference.log similarity index 100% rename from flakytests/cylc-show/00-simple/reference.log rename to tests/flakyfunctional/cylc-show/00-simple/reference.log diff --git a/flakytests/cylc-show/00-simple/suite.rc b/tests/flakyfunctional/cylc-show/00-simple/suite.rc similarity index 100% rename from flakytests/cylc-show/00-simple/suite.rc rename to tests/flakyfunctional/cylc-show/00-simple/suite.rc diff --git a/flakytests/cylc-show/04-multi.t b/tests/flakyfunctional/cylc-show/04-multi.t similarity index 100% rename from flakytests/cylc-show/04-multi.t rename to tests/flakyfunctional/cylc-show/04-multi.t diff --git a/flakytests/cylc-show/04-multi/reference.log b/tests/flakyfunctional/cylc-show/04-multi/reference.log similarity index 100% rename from flakytests/cylc-show/04-multi/reference.log rename to tests/flakyfunctional/cylc-show/04-multi/reference.log diff --git a/flakytests/cylc-show/04-multi/suite.rc b/tests/flakyfunctional/cylc-show/04-multi/suite.rc similarity index 100% rename from flakytests/cylc-show/04-multi/suite.rc rename to tests/flakyfunctional/cylc-show/04-multi/suite.rc diff --git a/flakytests/cylc-show/06-prereqs-outputs.t b/tests/flakyfunctional/cylc-show/06-prereqs-outputs.t similarity index 100% rename from flakytests/cylc-show/06-prereqs-outputs.t rename to tests/flakyfunctional/cylc-show/06-prereqs-outputs.t diff --git a/flakytests/cylc-show/06-prereqs-outputs/suite.rc b/tests/flakyfunctional/cylc-show/06-prereqs-outputs/suite.rc similarity index 100% rename from flakytests/cylc-show/06-prereqs-outputs/suite.rc rename to tests/flakyfunctional/cylc-show/06-prereqs-outputs/suite.rc diff --git a/flakytests/cylc-show/test_header b/tests/flakyfunctional/cylc-show/test_header similarity index 100% rename from flakytests/cylc-show/test_header rename to tests/flakyfunctional/cylc-show/test_header diff --git a/flakytests/cylc-take-checkpoints/00-basic.t b/tests/flakyfunctional/cylc-take-checkpoints/00-basic.t similarity index 100% rename from flakytests/cylc-take-checkpoints/00-basic.t rename to tests/flakyfunctional/cylc-take-checkpoints/00-basic.t diff --git a/flakytests/cylc-take-checkpoints/00-basic/reference.log b/tests/flakyfunctional/cylc-take-checkpoints/00-basic/reference.log similarity index 100% rename from flakytests/cylc-take-checkpoints/00-basic/reference.log rename to tests/flakyfunctional/cylc-take-checkpoints/00-basic/reference.log diff --git a/flakytests/cylc-take-checkpoints/00-basic/suite.rc b/tests/flakyfunctional/cylc-take-checkpoints/00-basic/suite.rc similarity index 100% rename from flakytests/cylc-take-checkpoints/00-basic/suite.rc rename to tests/flakyfunctional/cylc-take-checkpoints/00-basic/suite.rc diff --git a/flakytests/cylc-take-checkpoints/test_header b/tests/flakyfunctional/cylc-take-checkpoints/test_header similarity index 100% rename from flakytests/cylc-take-checkpoints/test_header rename to tests/flakyfunctional/cylc-take-checkpoints/test_header diff --git a/flakytests/database/00-simple.t b/tests/flakyfunctional/database/00-simple.t similarity index 100% rename from flakytests/database/00-simple.t rename to tests/flakyfunctional/database/00-simple.t diff --git a/flakytests/database/00-simple/schema.out b/tests/flakyfunctional/database/00-simple/schema.out similarity index 100% rename from flakytests/database/00-simple/schema.out rename to tests/flakyfunctional/database/00-simple/schema.out diff --git a/flakytests/database/00-simple/select-inheritance.out b/tests/flakyfunctional/database/00-simple/select-inheritance.out similarity index 100% rename from flakytests/database/00-simple/select-inheritance.out rename to tests/flakyfunctional/database/00-simple/select-inheritance.out diff --git a/flakytests/database/00-simple/select-suite-params.out b/tests/flakyfunctional/database/00-simple/select-suite-params.out similarity index 100% rename from flakytests/database/00-simple/select-suite-params.out rename to tests/flakyfunctional/database/00-simple/select-suite-params.out diff --git a/flakytests/database/00-simple/select-task-events.out b/tests/flakyfunctional/database/00-simple/select-task-events.out similarity index 100% rename from flakytests/database/00-simple/select-task-events.out rename to tests/flakyfunctional/database/00-simple/select-task-events.out diff --git a/flakytests/database/00-simple/select-task-job-logs.out b/tests/flakyfunctional/database/00-simple/select-task-job-logs.out similarity index 100% rename from flakytests/database/00-simple/select-task-job-logs.out rename to tests/flakyfunctional/database/00-simple/select-task-job-logs.out diff --git a/flakytests/database/00-simple/select-task-pool.out b/tests/flakyfunctional/database/00-simple/select-task-pool.out similarity index 100% rename from flakytests/database/00-simple/select-task-pool.out rename to tests/flakyfunctional/database/00-simple/select-task-pool.out diff --git a/flakytests/database/00-simple/select-task-states.out b/tests/flakyfunctional/database/00-simple/select-task-states.out similarity index 100% rename from flakytests/database/00-simple/select-task-states.out rename to tests/flakyfunctional/database/00-simple/select-task-states.out diff --git a/flakytests/database/00-simple/suite.rc b/tests/flakyfunctional/database/00-simple/suite.rc similarity index 100% rename from flakytests/database/00-simple/suite.rc rename to tests/flakyfunctional/database/00-simple/suite.rc diff --git a/flakytests/database/01-broadcast.t b/tests/flakyfunctional/database/01-broadcast.t similarity index 100% rename from flakytests/database/01-broadcast.t rename to tests/flakyfunctional/database/01-broadcast.t diff --git a/flakytests/database/01-broadcast/reference.log b/tests/flakyfunctional/database/01-broadcast/reference.log similarity index 100% rename from flakytests/database/01-broadcast/reference.log rename to tests/flakyfunctional/database/01-broadcast/reference.log diff --git a/flakytests/database/01-broadcast/suite.rc b/tests/flakyfunctional/database/01-broadcast/suite.rc similarity index 100% rename from flakytests/database/01-broadcast/suite.rc rename to tests/flakyfunctional/database/01-broadcast/suite.rc diff --git a/flakytests/database/02-retry.t b/tests/flakyfunctional/database/02-retry.t similarity index 100% rename from flakytests/database/02-retry.t rename to tests/flakyfunctional/database/02-retry.t diff --git a/flakytests/database/02-retry/reference.log b/tests/flakyfunctional/database/02-retry/reference.log similarity index 100% rename from flakytests/database/02-retry/reference.log rename to tests/flakyfunctional/database/02-retry/reference.log diff --git a/flakytests/database/02-retry/suite.rc b/tests/flakyfunctional/database/02-retry/suite.rc similarity index 100% rename from flakytests/database/02-retry/suite.rc rename to tests/flakyfunctional/database/02-retry/suite.rc diff --git a/flakytests/database/test_header b/tests/flakyfunctional/database/test_header similarity index 100% rename from flakytests/database/test_header rename to tests/flakyfunctional/database/test_header diff --git a/flakytests/events/01-task.t b/tests/flakyfunctional/events/01-task.t similarity index 100% rename from flakytests/events/01-task.t rename to tests/flakyfunctional/events/01-task.t diff --git a/flakytests/events/01-task/bin/handler.sh b/tests/flakyfunctional/events/01-task/bin/handler.sh similarity index 100% rename from flakytests/events/01-task/bin/handler.sh rename to tests/flakyfunctional/events/01-task/bin/handler.sh diff --git a/flakytests/events/01-task/events.log b/tests/flakyfunctional/events/01-task/events.log similarity index 100% rename from flakytests/events/01-task/events.log rename to tests/flakyfunctional/events/01-task/events.log diff --git a/flakytests/events/01-task/reference.log b/tests/flakyfunctional/events/01-task/reference.log similarity index 100% rename from flakytests/events/01-task/reference.log rename to tests/flakyfunctional/events/01-task/reference.log diff --git a/flakytests/events/01-task/suite.rc b/tests/flakyfunctional/events/01-task/suite.rc similarity index 100% rename from flakytests/events/01-task/suite.rc rename to tests/flakyfunctional/events/01-task/suite.rc diff --git a/flakytests/events/05-timeout-ref-dummy.t b/tests/flakyfunctional/events/05-timeout-ref-dummy.t similarity index 100% rename from flakytests/events/05-timeout-ref-dummy.t rename to tests/flakyfunctional/events/05-timeout-ref-dummy.t diff --git a/flakytests/events/05-timeout-ref-dummy/reference.log b/tests/flakyfunctional/events/05-timeout-ref-dummy/reference.log similarity index 100% rename from flakytests/events/05-timeout-ref-dummy/reference.log rename to tests/flakyfunctional/events/05-timeout-ref-dummy/reference.log diff --git a/flakytests/events/05-timeout-ref-dummy/suite.rc b/tests/flakyfunctional/events/05-timeout-ref-dummy/suite.rc similarity index 100% rename from flakytests/events/05-timeout-ref-dummy/suite.rc rename to tests/flakyfunctional/events/05-timeout-ref-dummy/suite.rc diff --git a/flakytests/events/31-dont-stall-succeeded.t b/tests/flakyfunctional/events/31-dont-stall-succeeded.t similarity index 100% rename from flakytests/events/31-dont-stall-succeeded.t rename to tests/flakyfunctional/events/31-dont-stall-succeeded.t diff --git a/flakytests/events/31-dont-stall-succeeded/suite.rc b/tests/flakyfunctional/events/31-dont-stall-succeeded/suite.rc similarity index 100% rename from flakytests/events/31-dont-stall-succeeded/suite.rc rename to tests/flakyfunctional/events/31-dont-stall-succeeded/suite.rc diff --git a/flakytests/events/39-task-event-template-all.t b/tests/flakyfunctional/events/39-task-event-template-all.t similarity index 100% rename from flakytests/events/39-task-event-template-all.t rename to tests/flakyfunctional/events/39-task-event-template-all.t diff --git a/flakytests/events/39-task-event-template-all/bin/checkargs b/tests/flakyfunctional/events/39-task-event-template-all/bin/checkargs similarity index 100% rename from flakytests/events/39-task-event-template-all/bin/checkargs rename to tests/flakyfunctional/events/39-task-event-template-all/bin/checkargs diff --git a/flakytests/events/39-task-event-template-all/reference.log b/tests/flakyfunctional/events/39-task-event-template-all/reference.log similarity index 100% rename from flakytests/events/39-task-event-template-all/reference.log rename to tests/flakyfunctional/events/39-task-event-template-all/reference.log diff --git a/flakytests/events/39-task-event-template-all/suite.rc b/tests/flakyfunctional/events/39-task-event-template-all/suite.rc similarity index 100% rename from flakytests/events/39-task-event-template-all/suite.rc rename to tests/flakyfunctional/events/39-task-event-template-all/suite.rc diff --git a/flakytests/events/40-stall-despite-clock-trig.t b/tests/flakyfunctional/events/40-stall-despite-clock-trig.t similarity index 100% rename from flakytests/events/40-stall-despite-clock-trig.t rename to tests/flakyfunctional/events/40-stall-despite-clock-trig.t diff --git a/flakytests/events/40-stall-despite-clock-trig/suite.rc b/tests/flakyfunctional/events/40-stall-despite-clock-trig/suite.rc similarity index 100% rename from flakytests/events/40-stall-despite-clock-trig/suite.rc rename to tests/flakyfunctional/events/40-stall-despite-clock-trig/suite.rc diff --git a/flakytests/events/44-timeout.t b/tests/flakyfunctional/events/44-timeout.t similarity index 100% rename from flakytests/events/44-timeout.t rename to tests/flakyfunctional/events/44-timeout.t diff --git a/flakytests/events/44-timeout/bin/sleeper.sh b/tests/flakyfunctional/events/44-timeout/bin/sleeper.sh similarity index 100% rename from flakytests/events/44-timeout/bin/sleeper.sh rename to tests/flakyfunctional/events/44-timeout/bin/sleeper.sh diff --git a/flakytests/events/44-timeout/suite.rc b/tests/flakyfunctional/events/44-timeout/suite.rc similarity index 100% rename from flakytests/events/44-timeout/suite.rc rename to tests/flakyfunctional/events/44-timeout/suite.rc diff --git a/flakytests/events/test_header b/tests/flakyfunctional/events/test_header similarity index 100% rename from flakytests/events/test_header rename to tests/flakyfunctional/events/test_header diff --git a/flakytests/execution-time-limit/00-background.t b/tests/flakyfunctional/execution-time-limit/00-background.t similarity index 100% rename from flakytests/execution-time-limit/00-background.t rename to tests/flakyfunctional/execution-time-limit/00-background.t diff --git a/flakytests/execution-time-limit/00-background/reference.log b/tests/flakyfunctional/execution-time-limit/00-background/reference.log similarity index 100% rename from flakytests/execution-time-limit/00-background/reference.log rename to tests/flakyfunctional/execution-time-limit/00-background/reference.log diff --git a/flakytests/execution-time-limit/00-background/suite.rc b/tests/flakyfunctional/execution-time-limit/00-background/suite.rc similarity index 100% rename from flakytests/execution-time-limit/00-background/suite.rc rename to tests/flakyfunctional/execution-time-limit/00-background/suite.rc diff --git a/flakytests/execution-time-limit/01-at b/tests/flakyfunctional/execution-time-limit/01-at similarity index 100% rename from flakytests/execution-time-limit/01-at rename to tests/flakyfunctional/execution-time-limit/01-at diff --git a/flakytests/execution-time-limit/01-at.t b/tests/flakyfunctional/execution-time-limit/01-at.t similarity index 100% rename from flakytests/execution-time-limit/01-at.t rename to tests/flakyfunctional/execution-time-limit/01-at.t diff --git a/flakytests/execution-time-limit/04-poll.t b/tests/flakyfunctional/execution-time-limit/04-poll.t similarity index 100% rename from flakytests/execution-time-limit/04-poll.t rename to tests/flakyfunctional/execution-time-limit/04-poll.t diff --git a/flakytests/execution-time-limit/04-poll/reference.log b/tests/flakyfunctional/execution-time-limit/04-poll/reference.log similarity index 100% rename from flakytests/execution-time-limit/04-poll/reference.log rename to tests/flakyfunctional/execution-time-limit/04-poll/reference.log diff --git a/flakytests/execution-time-limit/04-poll/suite.rc b/tests/flakyfunctional/execution-time-limit/04-poll/suite.rc similarity index 100% rename from flakytests/execution-time-limit/04-poll/suite.rc rename to tests/flakyfunctional/execution-time-limit/04-poll/suite.rc diff --git a/flakytests/execution-time-limit/test_header b/tests/flakyfunctional/execution-time-limit/test_header similarity index 100% rename from flakytests/execution-time-limit/test_header rename to tests/flakyfunctional/execution-time-limit/test_header diff --git a/flakytests/hold-release/13-ready-restart.t b/tests/flakyfunctional/hold-release/13-ready-restart.t similarity index 100% rename from flakytests/hold-release/13-ready-restart.t rename to tests/flakyfunctional/hold-release/13-ready-restart.t diff --git a/flakytests/hold-release/13-ready-restart/bin/my-file-poll b/tests/flakyfunctional/hold-release/13-ready-restart/bin/my-file-poll similarity index 100% rename from flakytests/hold-release/13-ready-restart/bin/my-file-poll rename to tests/flakyfunctional/hold-release/13-ready-restart/bin/my-file-poll diff --git a/flakytests/hold-release/13-ready-restart/suite.rc b/tests/flakyfunctional/hold-release/13-ready-restart/suite.rc similarity index 100% rename from flakytests/hold-release/13-ready-restart/suite.rc rename to tests/flakyfunctional/hold-release/13-ready-restart/suite.rc diff --git a/flakytests/hold-release/14-hold-kill.t b/tests/flakyfunctional/hold-release/14-hold-kill.t similarity index 100% rename from flakytests/hold-release/14-hold-kill.t rename to tests/flakyfunctional/hold-release/14-hold-kill.t diff --git a/flakytests/hold-release/14-hold-kill/reference.log b/tests/flakyfunctional/hold-release/14-hold-kill/reference.log similarity index 100% rename from flakytests/hold-release/14-hold-kill/reference.log rename to tests/flakyfunctional/hold-release/14-hold-kill/reference.log diff --git a/flakytests/hold-release/14-hold-kill/suite.rc b/tests/flakyfunctional/hold-release/14-hold-kill/suite.rc similarity index 100% rename from flakytests/hold-release/14-hold-kill/suite.rc rename to tests/flakyfunctional/hold-release/14-hold-kill/suite.rc diff --git a/flakytests/hold-release/15-hold-after.t b/tests/flakyfunctional/hold-release/15-hold-after.t similarity index 100% rename from flakytests/hold-release/15-hold-after.t rename to tests/flakyfunctional/hold-release/15-hold-after.t diff --git a/flakytests/hold-release/15-hold-after/reference.log b/tests/flakyfunctional/hold-release/15-hold-after/reference.log similarity index 100% rename from flakytests/hold-release/15-hold-after/reference.log rename to tests/flakyfunctional/hold-release/15-hold-after/reference.log diff --git a/flakytests/hold-release/15-hold-after/suite.rc b/tests/flakyfunctional/hold-release/15-hold-after/suite.rc similarity index 100% rename from flakytests/hold-release/15-hold-after/suite.rc rename to tests/flakyfunctional/hold-release/15-hold-after/suite.rc diff --git a/flakytests/hold-release/20-reset-waiting-output.t b/tests/flakyfunctional/hold-release/20-reset-waiting-output.t similarity index 100% rename from flakytests/hold-release/20-reset-waiting-output.t rename to tests/flakyfunctional/hold-release/20-reset-waiting-output.t diff --git a/flakytests/hold-release/20-reset-waiting-output/reference.log b/tests/flakyfunctional/hold-release/20-reset-waiting-output/reference.log similarity index 100% rename from flakytests/hold-release/20-reset-waiting-output/reference.log rename to tests/flakyfunctional/hold-release/20-reset-waiting-output/reference.log diff --git a/flakytests/hold-release/20-reset-waiting-output/suite.rc b/tests/flakyfunctional/hold-release/20-reset-waiting-output/suite.rc similarity index 100% rename from flakytests/hold-release/20-reset-waiting-output/suite.rc rename to tests/flakyfunctional/hold-release/20-reset-waiting-output/suite.rc diff --git a/flakytests/hold-release/test_header b/tests/flakyfunctional/hold-release/test_header similarity index 100% rename from flakytests/hold-release/test_header rename to tests/flakyfunctional/hold-release/test_header diff --git a/flakytests/integer-cycling/00-satellite.t b/tests/flakyfunctional/integer-cycling/00-satellite.t similarity index 100% rename from flakytests/integer-cycling/00-satellite.t rename to tests/flakyfunctional/integer-cycling/00-satellite.t diff --git a/flakytests/integer-cycling/00-satellite/reference.log b/tests/flakyfunctional/integer-cycling/00-satellite/reference.log similarity index 100% rename from flakytests/integer-cycling/00-satellite/reference.log rename to tests/flakyfunctional/integer-cycling/00-satellite/reference.log diff --git a/flakytests/integer-cycling/00-satellite/suite.rc b/tests/flakyfunctional/integer-cycling/00-satellite/suite.rc similarity index 100% rename from flakytests/integer-cycling/00-satellite/suite.rc rename to tests/flakyfunctional/integer-cycling/00-satellite/suite.rc diff --git a/flakytests/integer-cycling/test_header b/tests/flakyfunctional/integer-cycling/test_header similarity index 100% rename from flakytests/integer-cycling/test_header rename to tests/flakyfunctional/integer-cycling/test_header diff --git a/flakytests/job-submission/05-activity-log.t b/tests/flakyfunctional/job-submission/05-activity-log.t similarity index 100% rename from flakytests/job-submission/05-activity-log.t rename to tests/flakyfunctional/job-submission/05-activity-log.t diff --git a/flakytests/job-submission/05-activity-log/reference.log b/tests/flakyfunctional/job-submission/05-activity-log/reference.log similarity index 100% rename from flakytests/job-submission/05-activity-log/reference.log rename to tests/flakyfunctional/job-submission/05-activity-log/reference.log diff --git a/flakytests/job-submission/05-activity-log/suite.rc b/tests/flakyfunctional/job-submission/05-activity-log/suite.rc similarity index 100% rename from flakytests/job-submission/05-activity-log/suite.rc rename to tests/flakyfunctional/job-submission/05-activity-log/suite.rc diff --git a/flakytests/job-submission/18-check-chunking.t b/tests/flakyfunctional/job-submission/18-check-chunking.t similarity index 100% rename from flakytests/job-submission/18-check-chunking.t rename to tests/flakyfunctional/job-submission/18-check-chunking.t diff --git a/flakytests/job-submission/19-chatty.t b/tests/flakyfunctional/job-submission/19-chatty.t similarity index 100% rename from flakytests/job-submission/19-chatty.t rename to tests/flakyfunctional/job-submission/19-chatty.t diff --git a/flakytests/job-submission/19-chatty/bin/talkingnonsense b/tests/flakyfunctional/job-submission/19-chatty/bin/talkingnonsense similarity index 100% rename from flakytests/job-submission/19-chatty/bin/talkingnonsense rename to tests/flakyfunctional/job-submission/19-chatty/bin/talkingnonsense diff --git a/flakytests/job-submission/19-chatty/suite.rc b/tests/flakyfunctional/job-submission/19-chatty/suite.rc similarity index 100% rename from flakytests/job-submission/19-chatty/suite.rc rename to tests/flakyfunctional/job-submission/19-chatty/suite.rc diff --git a/flakytests/job-submission/test_header b/tests/flakyfunctional/job-submission/test_header similarity index 100% rename from flakytests/job-submission/test_header rename to tests/flakyfunctional/job-submission/test_header diff --git a/flakytests/lib b/tests/flakyfunctional/lib similarity index 100% rename from flakytests/lib rename to tests/flakyfunctional/lib diff --git a/flakytests/modes/03-dummy-env.t b/tests/flakyfunctional/modes/03-dummy-env.t similarity index 100% rename from flakytests/modes/03-dummy-env.t rename to tests/flakyfunctional/modes/03-dummy-env.t diff --git a/flakytests/modes/03-dummy-env/reference.log b/tests/flakyfunctional/modes/03-dummy-env/reference.log similarity index 100% rename from flakytests/modes/03-dummy-env/reference.log rename to tests/flakyfunctional/modes/03-dummy-env/reference.log diff --git a/flakytests/modes/03-dummy-env/suite.rc b/tests/flakyfunctional/modes/03-dummy-env/suite.rc similarity index 100% rename from flakytests/modes/03-dummy-env/suite.rc rename to tests/flakyfunctional/modes/03-dummy-env/suite.rc diff --git a/flakytests/modes/test_header b/tests/flakyfunctional/modes/test_header similarity index 100% rename from flakytests/modes/test_header rename to tests/flakyfunctional/modes/test_header diff --git a/flakytests/registration/02-on-the-fly.t b/tests/flakyfunctional/registration/02-on-the-fly.t similarity index 100% rename from flakytests/registration/02-on-the-fly.t rename to tests/flakyfunctional/registration/02-on-the-fly.t diff --git a/flakytests/registration/test_header b/tests/flakyfunctional/registration/test_header similarity index 100% rename from flakytests/registration/test_header rename to tests/flakyfunctional/registration/test_header diff --git a/flakytests/restart/14-multicycle.t b/tests/flakyfunctional/restart/14-multicycle.t similarity index 100% rename from flakytests/restart/14-multicycle.t rename to tests/flakyfunctional/restart/14-multicycle.t diff --git a/flakytests/restart/14-multicycle/bin/ctb-select-task-states b/tests/flakyfunctional/restart/14-multicycle/bin/ctb-select-task-states similarity index 100% rename from flakytests/restart/14-multicycle/bin/ctb-select-task-states rename to tests/flakyfunctional/restart/14-multicycle/bin/ctb-select-task-states diff --git a/flakytests/restart/14-multicycle/suite.rc b/tests/flakyfunctional/restart/14-multicycle/suite.rc similarity index 100% rename from flakytests/restart/14-multicycle/suite.rc rename to tests/flakyfunctional/restart/14-multicycle/suite.rc diff --git a/flakytests/restart/19-checkpoint.t b/tests/flakyfunctional/restart/19-checkpoint.t similarity index 100% rename from flakytests/restart/19-checkpoint.t rename to tests/flakyfunctional/restart/19-checkpoint.t diff --git a/flakytests/restart/19-checkpoint/reference.log b/tests/flakyfunctional/restart/19-checkpoint/reference.log similarity index 100% rename from flakytests/restart/19-checkpoint/reference.log rename to tests/flakyfunctional/restart/19-checkpoint/reference.log diff --git a/flakytests/restart/19-checkpoint/suite.rc b/tests/flakyfunctional/restart/19-checkpoint/suite.rc similarity index 100% rename from flakytests/restart/19-checkpoint/suite.rc rename to tests/flakyfunctional/restart/19-checkpoint/suite.rc diff --git a/flakytests/restart/19-checkpoint/suite2.rc b/tests/flakyfunctional/restart/19-checkpoint/suite2.rc similarity index 100% rename from flakytests/restart/19-checkpoint/suite2.rc rename to tests/flakyfunctional/restart/19-checkpoint/suite2.rc diff --git a/flakytests/restart/21-task-elapsed.t b/tests/flakyfunctional/restart/21-task-elapsed.t similarity index 100% rename from flakytests/restart/21-task-elapsed.t rename to tests/flakyfunctional/restart/21-task-elapsed.t diff --git a/flakytests/restart/21-task-elapsed/reference.log b/tests/flakyfunctional/restart/21-task-elapsed/reference.log similarity index 100% rename from flakytests/restart/21-task-elapsed/reference.log rename to tests/flakyfunctional/restart/21-task-elapsed/reference.log diff --git a/flakytests/restart/21-task-elapsed/suite.rc b/tests/flakyfunctional/restart/21-task-elapsed/suite.rc similarity index 100% rename from flakytests/restart/21-task-elapsed/suite.rc rename to tests/flakyfunctional/restart/21-task-elapsed/suite.rc diff --git a/flakytests/restart/39-auto-restart-no-suitable-host.t b/tests/flakyfunctional/restart/39-auto-restart-no-suitable-host.t similarity index 100% rename from flakytests/restart/39-auto-restart-no-suitable-host.t rename to tests/flakyfunctional/restart/39-auto-restart-no-suitable-host.t diff --git a/flakytests/restart/40-auto-restart-force-stop.t b/tests/flakyfunctional/restart/40-auto-restart-force-stop.t similarity index 100% rename from flakytests/restart/40-auto-restart-force-stop.t rename to tests/flakyfunctional/restart/40-auto-restart-force-stop.t diff --git a/flakytests/restart/46-stop-clock-time.t b/tests/flakyfunctional/restart/46-stop-clock-time.t similarity index 100% rename from flakytests/restart/46-stop-clock-time.t rename to tests/flakyfunctional/restart/46-stop-clock-time.t diff --git a/flakytests/restart/47-no-auto-stop.t b/tests/flakyfunctional/restart/47-no-auto-stop.t similarity index 100% rename from flakytests/restart/47-no-auto-stop.t rename to tests/flakyfunctional/restart/47-no-auto-stop.t diff --git a/flakytests/restart/bin/ctb-select-task-states b/tests/flakyfunctional/restart/bin/ctb-select-task-states similarity index 100% rename from flakytests/restart/bin/ctb-select-task-states rename to tests/flakyfunctional/restart/bin/ctb-select-task-states diff --git a/flakytests/restart/lib b/tests/flakyfunctional/restart/lib similarity index 100% rename from flakytests/restart/lib rename to tests/flakyfunctional/restart/lib diff --git a/flakytests/restart/test_header b/tests/flakyfunctional/restart/test_header similarity index 100% rename from flakytests/restart/test_header rename to tests/flakyfunctional/restart/test_header diff --git a/flakytests/shutdown/02-no-dir.t b/tests/flakyfunctional/shutdown/02-no-dir.t similarity index 100% rename from flakytests/shutdown/02-no-dir.t rename to tests/flakyfunctional/shutdown/02-no-dir.t diff --git a/flakytests/shutdown/02-no-dir/suite.rc b/tests/flakyfunctional/shutdown/02-no-dir/suite.rc similarity index 100% rename from flakytests/shutdown/02-no-dir/suite.rc rename to tests/flakyfunctional/shutdown/02-no-dir/suite.rc diff --git a/flakytests/shutdown/test_header b/tests/flakyfunctional/shutdown/test_header similarity index 100% rename from flakytests/shutdown/test_header rename to tests/flakyfunctional/shutdown/test_header diff --git a/flakytests/special/04-clock-triggered.t b/tests/flakyfunctional/special/04-clock-triggered.t similarity index 100% rename from flakytests/special/04-clock-triggered.t rename to tests/flakyfunctional/special/04-clock-triggered.t diff --git a/flakytests/special/04-clock-triggered/suite.rc b/tests/flakyfunctional/special/04-clock-triggered/suite.rc similarity index 100% rename from flakytests/special/04-clock-triggered/suite.rc rename to tests/flakyfunctional/special/04-clock-triggered/suite.rc diff --git a/flakytests/special/05-clock-triggered-utc b/tests/flakyfunctional/special/05-clock-triggered-utc similarity index 100% rename from flakytests/special/05-clock-triggered-utc rename to tests/flakyfunctional/special/05-clock-triggered-utc diff --git a/flakytests/special/05-clock-triggered-utc.t b/tests/flakyfunctional/special/05-clock-triggered-utc.t similarity index 100% rename from flakytests/special/05-clock-triggered-utc.t rename to tests/flakyfunctional/special/05-clock-triggered-utc.t diff --git a/flakytests/special/06-clock-triggered-iso b/tests/flakyfunctional/special/06-clock-triggered-iso similarity index 100% rename from flakytests/special/06-clock-triggered-iso rename to tests/flakyfunctional/special/06-clock-triggered-iso diff --git a/flakytests/special/06-clock-triggered-iso.t b/tests/flakyfunctional/special/06-clock-triggered-iso.t similarity index 100% rename from flakytests/special/06-clock-triggered-iso.t rename to tests/flakyfunctional/special/06-clock-triggered-iso.t diff --git a/flakytests/special/08-clock-triggered-0 b/tests/flakyfunctional/special/08-clock-triggered-0 similarity index 100% rename from flakytests/special/08-clock-triggered-0 rename to tests/flakyfunctional/special/08-clock-triggered-0 diff --git a/flakytests/special/08-clock-triggered-0.t b/tests/flakyfunctional/special/08-clock-triggered-0.t similarity index 100% rename from flakytests/special/08-clock-triggered-0.t rename to tests/flakyfunctional/special/08-clock-triggered-0.t diff --git a/flakytests/special/test_header b/tests/flakyfunctional/special/test_header similarity index 100% rename from flakytests/special/test_header rename to tests/flakyfunctional/special/test_header diff --git a/flakytests/xtriggers/00-wall_clock.t b/tests/flakyfunctional/xtriggers/00-wall_clock.t similarity index 100% rename from flakytests/xtriggers/00-wall_clock.t rename to tests/flakyfunctional/xtriggers/00-wall_clock.t diff --git a/flakytests/xtriggers/00-wall_clock/suite.rc b/tests/flakyfunctional/xtriggers/00-wall_clock/suite.rc similarity index 100% rename from flakytests/xtriggers/00-wall_clock/suite.rc rename to tests/flakyfunctional/xtriggers/00-wall_clock/suite.rc diff --git a/flakytests/xtriggers/01-suite_state.t b/tests/flakyfunctional/xtriggers/01-suite_state.t similarity index 100% rename from flakytests/xtriggers/01-suite_state.t rename to tests/flakyfunctional/xtriggers/01-suite_state.t diff --git a/flakytests/xtriggers/01-suite_state/suite.rc b/tests/flakyfunctional/xtriggers/01-suite_state/suite.rc similarity index 100% rename from flakytests/xtriggers/01-suite_state/suite.rc rename to tests/flakyfunctional/xtriggers/01-suite_state/suite.rc diff --git a/flakytests/xtriggers/01-suite_state/upstream/suite.rc b/tests/flakyfunctional/xtriggers/01-suite_state/upstream/suite.rc similarity index 100% rename from flakytests/xtriggers/01-suite_state/upstream/suite.rc rename to tests/flakyfunctional/xtriggers/01-suite_state/upstream/suite.rc diff --git a/flakytests/xtriggers/test_header b/tests/flakyfunctional/xtriggers/test_header similarity index 100% rename from flakytests/xtriggers/test_header rename to tests/flakyfunctional/xtriggers/test_header diff --git a/tests/README.md b/tests/functional/README.md similarity index 58% rename from tests/README.md rename to tests/functional/README.md index 013d18b325c..d63edddcbf9 100644 --- a/tests/README.md +++ b/tests/functional/README.md @@ -5,11 +5,21 @@ This directory contains Cylc functional tests. ## How To Run These Tests ```console -$ etc/bin/run-functional-tests tests/ flakytests/ -$ etc/bin/run-functional-tests tests/ flakytests/ -j 4 # 4 tests in parallel +$ etc/bin/run-functional-tests tests/f tests/k +$ etc/bin/run-functional-tests tests/f tests/k # 4 tests in parallel ``` -## What Are Functional Tests +## Why Are There Flaky Tests? + +A lot of the functional tests are highly timing dependent which can cause +them to become flaky, especially on heavily loaded systems or slow +file systems. + +We put especially sensitive functional tests into the `flakyfunctional` +directory so that we can easily test them separately with fewer tests +running in parallel to give them a chance of passing. + +## What Are Functional Tests? These tests ensure end-to-end functionality is as expected. diff --git a/tests/api-suite-info/00-get-graph-raw-1.t b/tests/functional/api-suite-info/00-get-graph-raw-1.t similarity index 100% rename from tests/api-suite-info/00-get-graph-raw-1.t rename to tests/functional/api-suite-info/00-get-graph-raw-1.t diff --git a/tests/api-suite-info/00-get-graph-raw-1/bin/ctb-get-graph-raw b/tests/functional/api-suite-info/00-get-graph-raw-1/bin/ctb-get-graph-raw similarity index 100% rename from tests/api-suite-info/00-get-graph-raw-1/bin/ctb-get-graph-raw rename to tests/functional/api-suite-info/00-get-graph-raw-1/bin/ctb-get-graph-raw diff --git a/tests/api-suite-info/00-get-graph-raw-1/reference.log b/tests/functional/api-suite-info/00-get-graph-raw-1/reference.log similarity index 100% rename from tests/api-suite-info/00-get-graph-raw-1/reference.log rename to tests/functional/api-suite-info/00-get-graph-raw-1/reference.log diff --git a/tests/api-suite-info/00-get-graph-raw-1/suite.rc b/tests/functional/api-suite-info/00-get-graph-raw-1/suite.rc similarity index 100% rename from tests/api-suite-info/00-get-graph-raw-1/suite.rc rename to tests/functional/api-suite-info/00-get-graph-raw-1/suite.rc diff --git a/tests/api-suite-info/01-get-graph-raw-2.t b/tests/functional/api-suite-info/01-get-graph-raw-2.t similarity index 100% rename from tests/api-suite-info/01-get-graph-raw-2.t rename to tests/functional/api-suite-info/01-get-graph-raw-2.t diff --git a/tests/api-suite-info/01-get-graph-raw-2/bin/ctb-get-graph-raw b/tests/functional/api-suite-info/01-get-graph-raw-2/bin/ctb-get-graph-raw similarity index 100% rename from tests/api-suite-info/01-get-graph-raw-2/bin/ctb-get-graph-raw rename to tests/functional/api-suite-info/01-get-graph-raw-2/bin/ctb-get-graph-raw diff --git a/tests/api-suite-info/01-get-graph-raw-2/reference.log b/tests/functional/api-suite-info/01-get-graph-raw-2/reference.log similarity index 100% rename from tests/api-suite-info/01-get-graph-raw-2/reference.log rename to tests/functional/api-suite-info/01-get-graph-raw-2/reference.log diff --git a/tests/api-suite-info/01-get-graph-raw-2/suite.rc b/tests/functional/api-suite-info/01-get-graph-raw-2/suite.rc similarity index 100% rename from tests/api-suite-info/01-get-graph-raw-2/suite.rc rename to tests/functional/api-suite-info/01-get-graph-raw-2/suite.rc diff --git a/tests/api-suite-info/02-get-graph-raw-3.t b/tests/functional/api-suite-info/02-get-graph-raw-3.t similarity index 100% rename from tests/api-suite-info/02-get-graph-raw-3.t rename to tests/functional/api-suite-info/02-get-graph-raw-3.t diff --git a/tests/api-suite-info/02-get-graph-raw-3/bin/ctb-get-graph-raw b/tests/functional/api-suite-info/02-get-graph-raw-3/bin/ctb-get-graph-raw similarity index 100% rename from tests/api-suite-info/02-get-graph-raw-3/bin/ctb-get-graph-raw rename to tests/functional/api-suite-info/02-get-graph-raw-3/bin/ctb-get-graph-raw diff --git a/tests/api-suite-info/02-get-graph-raw-3/reference.log b/tests/functional/api-suite-info/02-get-graph-raw-3/reference.log similarity index 100% rename from tests/api-suite-info/02-get-graph-raw-3/reference.log rename to tests/functional/api-suite-info/02-get-graph-raw-3/reference.log diff --git a/tests/api-suite-info/02-get-graph-raw-3/suite.rc b/tests/functional/api-suite-info/02-get-graph-raw-3/suite.rc similarity index 100% rename from tests/api-suite-info/02-get-graph-raw-3/suite.rc rename to tests/functional/api-suite-info/02-get-graph-raw-3/suite.rc diff --git a/tests/api-suite-info/03-get-graph-raw-4.t b/tests/functional/api-suite-info/03-get-graph-raw-4.t similarity index 100% rename from tests/api-suite-info/03-get-graph-raw-4.t rename to tests/functional/api-suite-info/03-get-graph-raw-4.t diff --git a/tests/api-suite-info/03-get-graph-raw-4/bin/ctb-get-graph-raw b/tests/functional/api-suite-info/03-get-graph-raw-4/bin/ctb-get-graph-raw similarity index 100% rename from tests/api-suite-info/03-get-graph-raw-4/bin/ctb-get-graph-raw rename to tests/functional/api-suite-info/03-get-graph-raw-4/bin/ctb-get-graph-raw diff --git a/tests/api-suite-info/03-get-graph-raw-4/reference.log b/tests/functional/api-suite-info/03-get-graph-raw-4/reference.log similarity index 100% rename from tests/api-suite-info/03-get-graph-raw-4/reference.log rename to tests/functional/api-suite-info/03-get-graph-raw-4/reference.log diff --git a/tests/api-suite-info/03-get-graph-raw-4/suite.rc b/tests/functional/api-suite-info/03-get-graph-raw-4/suite.rc similarity index 100% rename from tests/api-suite-info/03-get-graph-raw-4/suite.rc rename to tests/functional/api-suite-info/03-get-graph-raw-4/suite.rc diff --git a/tests/api-suite-info/test_header b/tests/functional/api-suite-info/test_header similarity index 100% rename from tests/api-suite-info/test_header rename to tests/functional/api-suite-info/test_header diff --git a/tests/authentication/00-shared-fs.t b/tests/functional/authentication/00-shared-fs.t similarity index 100% rename from tests/authentication/00-shared-fs.t rename to tests/functional/authentication/00-shared-fs.t diff --git a/tests/authentication/00-shared-fs/reference.log b/tests/functional/authentication/00-shared-fs/reference.log similarity index 100% rename from tests/authentication/00-shared-fs/reference.log rename to tests/functional/authentication/00-shared-fs/reference.log diff --git a/tests/authentication/00-shared-fs/suite.rc b/tests/functional/authentication/00-shared-fs/suite.rc similarity index 100% rename from tests/authentication/00-shared-fs/suite.rc rename to tests/functional/authentication/00-shared-fs/suite.rc diff --git a/tests/authentication/01-remote-suite-same-name.t b/tests/functional/authentication/01-remote-suite-same-name.t similarity index 100% rename from tests/authentication/01-remote-suite-same-name.t rename to tests/functional/authentication/01-remote-suite-same-name.t diff --git a/tests/authentication/01-remote-suite-same-name/reference.log b/tests/functional/authentication/01-remote-suite-same-name/reference.log similarity index 100% rename from tests/authentication/01-remote-suite-same-name/reference.log rename to tests/functional/authentication/01-remote-suite-same-name/reference.log diff --git a/tests/authentication/01-remote-suite-same-name/suite.rc b/tests/functional/authentication/01-remote-suite-same-name/suite.rc similarity index 100% rename from tests/authentication/01-remote-suite-same-name/suite.rc rename to tests/functional/authentication/01-remote-suite-same-name/suite.rc diff --git a/tests/authentication/02-suite2-stop-suite1.t b/tests/functional/authentication/02-suite2-stop-suite1.t similarity index 100% rename from tests/authentication/02-suite2-stop-suite1.t rename to tests/functional/authentication/02-suite2-stop-suite1.t diff --git a/tests/authentication/basic/suite.rc b/tests/functional/authentication/basic/suite.rc similarity index 100% rename from tests/authentication/basic/suite.rc rename to tests/functional/authentication/basic/suite.rc diff --git a/tests/authentication/test_header b/tests/functional/authentication/test_header similarity index 100% rename from tests/authentication/test_header rename to tests/functional/authentication/test_header diff --git a/tests/broadcast/00-simple.t b/tests/functional/broadcast/00-simple.t similarity index 100% rename from tests/broadcast/00-simple.t rename to tests/functional/broadcast/00-simple.t diff --git a/tests/broadcast/00-simple/broadcast.ref b/tests/functional/broadcast/00-simple/broadcast.ref similarity index 100% rename from tests/broadcast/00-simple/broadcast.ref rename to tests/functional/broadcast/00-simple/broadcast.ref diff --git a/tests/broadcast/00-simple/expected-prep.err b/tests/functional/broadcast/00-simple/expected-prep.err similarity index 100% rename from tests/broadcast/00-simple/expected-prep.err rename to tests/functional/broadcast/00-simple/expected-prep.err diff --git a/tests/broadcast/00-simple/expected-prep.out b/tests/functional/broadcast/00-simple/expected-prep.out similarity index 100% rename from tests/broadcast/00-simple/expected-prep.out rename to tests/functional/broadcast/00-simple/expected-prep.out diff --git a/tests/broadcast/00-simple/reference.log b/tests/functional/broadcast/00-simple/reference.log similarity index 100% rename from tests/broadcast/00-simple/reference.log rename to tests/functional/broadcast/00-simple/reference.log diff --git a/tests/broadcast/00-simple/suite.rc b/tests/functional/broadcast/00-simple/suite.rc similarity index 100% rename from tests/broadcast/00-simple/suite.rc rename to tests/functional/broadcast/00-simple/suite.rc diff --git a/tests/broadcast/02-inherit.t b/tests/functional/broadcast/02-inherit.t similarity index 100% rename from tests/broadcast/02-inherit.t rename to tests/functional/broadcast/02-inherit.t diff --git a/tests/broadcast/02-inherit/reference.log b/tests/functional/broadcast/02-inherit/reference.log similarity index 100% rename from tests/broadcast/02-inherit/reference.log rename to tests/functional/broadcast/02-inherit/reference.log diff --git a/tests/broadcast/02-inherit/suite.rc b/tests/functional/broadcast/02-inherit/suite.rc similarity index 100% rename from tests/broadcast/02-inherit/suite.rc rename to tests/functional/broadcast/02-inherit/suite.rc diff --git a/tests/broadcast/03-expire.t b/tests/functional/broadcast/03-expire.t similarity index 100% rename from tests/broadcast/03-expire.t rename to tests/functional/broadcast/03-expire.t diff --git a/tests/broadcast/03-expire/reference.log b/tests/functional/broadcast/03-expire/reference.log similarity index 100% rename from tests/broadcast/03-expire/reference.log rename to tests/functional/broadcast/03-expire/reference.log diff --git a/tests/broadcast/03-expire/suite.rc b/tests/functional/broadcast/03-expire/suite.rc similarity index 100% rename from tests/broadcast/03-expire/suite.rc rename to tests/functional/broadcast/03-expire/suite.rc diff --git a/tests/broadcast/04-empty.t b/tests/functional/broadcast/04-empty.t similarity index 100% rename from tests/broadcast/04-empty.t rename to tests/functional/broadcast/04-empty.t diff --git a/tests/broadcast/04-empty/reference.log b/tests/functional/broadcast/04-empty/reference.log similarity index 100% rename from tests/broadcast/04-empty/reference.log rename to tests/functional/broadcast/04-empty/reference.log diff --git a/tests/broadcast/04-empty/suite.rc b/tests/functional/broadcast/04-empty/suite.rc similarity index 100% rename from tests/broadcast/04-empty/suite.rc rename to tests/functional/broadcast/04-empty/suite.rc diff --git a/tests/broadcast/05-bad-point.t b/tests/functional/broadcast/05-bad-point.t similarity index 100% rename from tests/broadcast/05-bad-point.t rename to tests/functional/broadcast/05-bad-point.t diff --git a/tests/broadcast/05-bad-point/suite.rc b/tests/functional/broadcast/05-bad-point/suite.rc similarity index 100% rename from tests/broadcast/05-bad-point/suite.rc rename to tests/functional/broadcast/05-bad-point/suite.rc diff --git a/tests/broadcast/06-bad-namespace.t b/tests/functional/broadcast/06-bad-namespace.t similarity index 100% rename from tests/broadcast/06-bad-namespace.t rename to tests/functional/broadcast/06-bad-namespace.t diff --git a/tests/broadcast/06-bad-namespace/suite.rc b/tests/functional/broadcast/06-bad-namespace/suite.rc similarity index 100% rename from tests/broadcast/06-bad-namespace/suite.rc rename to tests/functional/broadcast/06-bad-namespace/suite.rc diff --git a/tests/broadcast/07-timeout.t b/tests/functional/broadcast/07-timeout.t similarity index 100% rename from tests/broadcast/07-timeout.t rename to tests/functional/broadcast/07-timeout.t diff --git a/tests/broadcast/07-timeout/reference.log b/tests/functional/broadcast/07-timeout/reference.log similarity index 100% rename from tests/broadcast/07-timeout/reference.log rename to tests/functional/broadcast/07-timeout/reference.log diff --git a/tests/broadcast/07-timeout/suite.rc b/tests/functional/broadcast/07-timeout/suite.rc similarity index 100% rename from tests/broadcast/07-timeout/suite.rc rename to tests/functional/broadcast/07-timeout/suite.rc diff --git a/tests/broadcast/08-space.t b/tests/functional/broadcast/08-space.t similarity index 100% rename from tests/broadcast/08-space.t rename to tests/functional/broadcast/08-space.t diff --git a/tests/broadcast/08-space/reference.log b/tests/functional/broadcast/08-space/reference.log similarity index 100% rename from tests/broadcast/08-space/reference.log rename to tests/functional/broadcast/08-space/reference.log diff --git a/tests/broadcast/08-space/suite.rc b/tests/functional/broadcast/08-space/suite.rc similarity index 100% rename from tests/broadcast/08-space/suite.rc rename to tests/functional/broadcast/08-space/suite.rc diff --git a/tests/broadcast/09-remote.t b/tests/functional/broadcast/09-remote.t similarity index 100% rename from tests/broadcast/09-remote.t rename to tests/functional/broadcast/09-remote.t diff --git a/tests/broadcast/09-remote/reference.log b/tests/functional/broadcast/09-remote/reference.log similarity index 100% rename from tests/broadcast/09-remote/reference.log rename to tests/functional/broadcast/09-remote/reference.log diff --git a/tests/broadcast/09-remote/suite.rc b/tests/functional/broadcast/09-remote/suite.rc similarity index 100% rename from tests/broadcast/09-remote/suite.rc rename to tests/functional/broadcast/09-remote/suite.rc diff --git a/tests/broadcast/10-file-1.t b/tests/functional/broadcast/10-file-1.t similarity index 100% rename from tests/broadcast/10-file-1.t rename to tests/functional/broadcast/10-file-1.t diff --git a/tests/broadcast/10-file-1/broadcast.rc b/tests/functional/broadcast/10-file-1/broadcast.rc similarity index 100% rename from tests/broadcast/10-file-1/broadcast.rc rename to tests/functional/broadcast/10-file-1/broadcast.rc diff --git a/tests/broadcast/10-file-1/reference.log b/tests/functional/broadcast/10-file-1/reference.log similarity index 100% rename from tests/broadcast/10-file-1/reference.log rename to tests/functional/broadcast/10-file-1/reference.log diff --git a/tests/broadcast/10-file-1/suite.rc b/tests/functional/broadcast/10-file-1/suite.rc similarity index 100% rename from tests/broadcast/10-file-1/suite.rc rename to tests/functional/broadcast/10-file-1/suite.rc diff --git a/tests/broadcast/11-file-2.t b/tests/functional/broadcast/11-file-2.t similarity index 100% rename from tests/broadcast/11-file-2.t rename to tests/functional/broadcast/11-file-2.t diff --git a/tests/broadcast/11-file-2/broadcast-1.rc b/tests/functional/broadcast/11-file-2/broadcast-1.rc similarity index 100% rename from tests/broadcast/11-file-2/broadcast-1.rc rename to tests/functional/broadcast/11-file-2/broadcast-1.rc diff --git a/tests/broadcast/11-file-2/broadcast-2.rc b/tests/functional/broadcast/11-file-2/broadcast-2.rc similarity index 100% rename from tests/broadcast/11-file-2/broadcast-2.rc rename to tests/functional/broadcast/11-file-2/broadcast-2.rc diff --git a/tests/broadcast/11-file-2/reference.log b/tests/functional/broadcast/11-file-2/reference.log similarity index 100% rename from tests/broadcast/11-file-2/reference.log rename to tests/functional/broadcast/11-file-2/reference.log diff --git a/tests/broadcast/11-file-2/suite.rc b/tests/functional/broadcast/11-file-2/suite.rc similarity index 100% rename from tests/broadcast/11-file-2/suite.rc rename to tests/functional/broadcast/11-file-2/suite.rc diff --git a/tests/broadcast/12-file-stdin.t b/tests/functional/broadcast/12-file-stdin.t similarity index 100% rename from tests/broadcast/12-file-stdin.t rename to tests/functional/broadcast/12-file-stdin.t diff --git a/tests/broadcast/12-file-stdin/broadcast.rc b/tests/functional/broadcast/12-file-stdin/broadcast.rc similarity index 100% rename from tests/broadcast/12-file-stdin/broadcast.rc rename to tests/functional/broadcast/12-file-stdin/broadcast.rc diff --git a/tests/broadcast/12-file-stdin/reference.log b/tests/functional/broadcast/12-file-stdin/reference.log similarity index 100% rename from tests/broadcast/12-file-stdin/reference.log rename to tests/functional/broadcast/12-file-stdin/reference.log diff --git a/tests/broadcast/12-file-stdin/suite.rc b/tests/functional/broadcast/12-file-stdin/suite.rc similarity index 100% rename from tests/broadcast/12-file-stdin/suite.rc rename to tests/functional/broadcast/12-file-stdin/suite.rc diff --git a/tests/broadcast/13-file-cancel.t b/tests/functional/broadcast/13-file-cancel.t similarity index 100% rename from tests/broadcast/13-file-cancel.t rename to tests/functional/broadcast/13-file-cancel.t diff --git a/tests/broadcast/13-file-cancel/broadcast-1.rc b/tests/functional/broadcast/13-file-cancel/broadcast-1.rc similarity index 100% rename from tests/broadcast/13-file-cancel/broadcast-1.rc rename to tests/functional/broadcast/13-file-cancel/broadcast-1.rc diff --git a/tests/broadcast/13-file-cancel/broadcast-2.rc b/tests/functional/broadcast/13-file-cancel/broadcast-2.rc similarity index 100% rename from tests/broadcast/13-file-cancel/broadcast-2.rc rename to tests/functional/broadcast/13-file-cancel/broadcast-2.rc diff --git a/tests/broadcast/13-file-cancel/reference.log b/tests/functional/broadcast/13-file-cancel/reference.log similarity index 100% rename from tests/broadcast/13-file-cancel/reference.log rename to tests/functional/broadcast/13-file-cancel/reference.log diff --git a/tests/broadcast/13-file-cancel/suite.rc b/tests/functional/broadcast/13-file-cancel/suite.rc similarity index 100% rename from tests/broadcast/13-file-cancel/suite.rc rename to tests/functional/broadcast/13-file-cancel/suite.rc diff --git a/tests/broadcast/test_header b/tests/functional/broadcast/test_header similarity index 100% rename from tests/broadcast/test_header rename to tests/functional/broadcast/test_header diff --git a/tests/cli/00-cycle-points.t b/tests/functional/cli/00-cycle-points.t similarity index 100% rename from tests/cli/00-cycle-points.t rename to tests/functional/cli/00-cycle-points.t diff --git a/tests/cli/00-cycle-points/suite.rc b/tests/functional/cli/00-cycle-points/suite.rc similarity index 100% rename from tests/cli/00-cycle-points/suite.rc rename to tests/functional/cli/00-cycle-points/suite.rc diff --git a/tests/cli/01-help.t b/tests/functional/cli/01-help.t similarity index 100% rename from tests/cli/01-help.t rename to tests/functional/cli/01-help.t diff --git a/tests/cli/02-now.t b/tests/functional/cli/02-now.t similarity index 100% rename from tests/cli/02-now.t rename to tests/functional/cli/02-now.t diff --git a/tests/cli/03-set-verbosity.t b/tests/functional/cli/03-set-verbosity.t similarity index 100% rename from tests/cli/03-set-verbosity.t rename to tests/functional/cli/03-set-verbosity.t diff --git a/tests/cli/test_header b/tests/functional/cli/test_header similarity index 100% rename from tests/cli/test_header rename to tests/functional/cli/test_header diff --git a/tests/clock-expire/00-basic.t b/tests/functional/clock-expire/00-basic.t similarity index 100% rename from tests/clock-expire/00-basic.t rename to tests/functional/clock-expire/00-basic.t diff --git a/tests/clock-expire/00-basic/suite.rc b/tests/functional/clock-expire/00-basic/suite.rc similarity index 100% rename from tests/clock-expire/00-basic/suite.rc rename to tests/functional/clock-expire/00-basic/suite.rc diff --git a/tests/clock-expire/test_header b/tests/functional/clock-expire/test_header similarity index 100% rename from tests/clock-expire/test_header rename to tests/functional/clock-expire/test_header diff --git a/tests/cyclepoint/00-time.t b/tests/functional/cyclepoint/00-time.t similarity index 100% rename from tests/cyclepoint/00-time.t rename to tests/functional/cyclepoint/00-time.t diff --git a/tests/cyclepoint/02-template.t b/tests/functional/cyclepoint/02-template.t similarity index 100% rename from tests/cyclepoint/02-template.t rename to tests/functional/cyclepoint/02-template.t diff --git a/tests/cyclepoint/test_header b/tests/functional/cyclepoint/test_header similarity index 100% rename from tests/cyclepoint/test_header rename to tests/functional/cyclepoint/test_header diff --git a/tests/cyclers/00-daily-find.out b/tests/functional/cyclers/00-daily-find.out similarity index 100% rename from tests/cyclers/00-daily-find.out rename to tests/functional/cyclers/00-daily-find.out diff --git a/tests/cyclers/00-daily.t b/tests/functional/cyclers/00-daily.t similarity index 100% rename from tests/cyclers/00-daily.t rename to tests/functional/cyclers/00-daily.t diff --git a/tests/cyclers/0000_rollunder/suite.rc b/tests/functional/cyclers/0000_rollunder/suite.rc similarity index 100% rename from tests/cyclers/0000_rollunder/suite.rc rename to tests/functional/cyclers/0000_rollunder/suite.rc diff --git a/tests/cyclers/01-hourly.t b/tests/functional/cyclers/01-hourly.t similarity index 100% rename from tests/cyclers/01-hourly.t rename to tests/functional/cyclers/01-hourly.t diff --git a/tests/cyclers/02-monthly.t b/tests/functional/cyclers/02-monthly.t similarity index 100% rename from tests/cyclers/02-monthly.t rename to tests/functional/cyclers/02-monthly.t diff --git a/tests/cyclers/03-multidaily.t b/tests/functional/cyclers/03-multidaily.t similarity index 100% rename from tests/cyclers/03-multidaily.t rename to tests/functional/cyclers/03-multidaily.t diff --git a/tests/cyclers/04-multihourly.t b/tests/functional/cyclers/04-multihourly.t similarity index 100% rename from tests/cyclers/04-multihourly.t rename to tests/functional/cyclers/04-multihourly.t diff --git a/tests/cyclers/05-multimonthly.t b/tests/functional/cyclers/05-multimonthly.t similarity index 100% rename from tests/cyclers/05-multimonthly.t rename to tests/functional/cyclers/05-multimonthly.t diff --git a/tests/cyclers/06-multiweekly.t b/tests/functional/cyclers/06-multiweekly.t similarity index 100% rename from tests/cyclers/06-multiweekly.t rename to tests/functional/cyclers/06-multiweekly.t diff --git a/tests/cyclers/07-multiyearly.t b/tests/functional/cyclers/07-multiyearly.t similarity index 100% rename from tests/cyclers/07-multiyearly.t rename to tests/functional/cyclers/07-multiyearly.t diff --git a/tests/cyclers/08-offset_final.t b/tests/functional/cyclers/08-offset_final.t similarity index 100% rename from tests/cyclers/08-offset_final.t rename to tests/functional/cyclers/08-offset_final.t diff --git a/tests/cyclers/09-offset_initial.t b/tests/functional/cyclers/09-offset_initial.t similarity index 100% rename from tests/cyclers/09-offset_initial.t rename to tests/functional/cyclers/09-offset_initial.t diff --git a/tests/cyclers/10-r1_final.t b/tests/functional/cyclers/10-r1_final.t similarity index 100% rename from tests/cyclers/10-r1_final.t rename to tests/functional/cyclers/10-r1_final.t diff --git a/tests/cyclers/11-r1_initial.t b/tests/functional/cyclers/11-r1_initial.t similarity index 100% rename from tests/cyclers/11-r1_initial.t rename to tests/functional/cyclers/11-r1_initial.t diff --git a/tests/cyclers/12-r1_middle.t b/tests/functional/cyclers/12-r1_middle.t similarity index 100% rename from tests/cyclers/12-r1_middle.t rename to tests/functional/cyclers/12-r1_middle.t diff --git a/tests/cyclers/13-r5_final.t b/tests/functional/cyclers/13-r5_final.t similarity index 100% rename from tests/cyclers/13-r5_final.t rename to tests/functional/cyclers/13-r5_final.t diff --git a/tests/cyclers/14-r5_initial.t b/tests/functional/cyclers/14-r5_initial.t similarity index 100% rename from tests/cyclers/14-r5_initial.t rename to tests/functional/cyclers/14-r5_initial.t diff --git a/tests/cyclers/15-subhourly.t b/tests/functional/cyclers/15-subhourly.t similarity index 100% rename from tests/cyclers/15-subhourly.t rename to tests/functional/cyclers/15-subhourly.t diff --git a/tests/cyclers/16-weekly.t b/tests/functional/cyclers/16-weekly.t similarity index 100% rename from tests/cyclers/16-weekly.t rename to tests/functional/cyclers/16-weekly.t diff --git a/tests/cyclers/17-yearly.t b/tests/functional/cyclers/17-yearly.t similarity index 100% rename from tests/cyclers/17-yearly.t rename to tests/functional/cyclers/17-yearly.t diff --git a/tests/cyclers/18-r1_multi_start.t b/tests/functional/cyclers/18-r1_multi_start.t similarity index 100% rename from tests/cyclers/18-r1_multi_start.t rename to tests/functional/cyclers/18-r1_multi_start.t diff --git a/tests/cyclers/20-multidaily_local.t b/tests/functional/cyclers/20-multidaily_local.t similarity index 100% rename from tests/cyclers/20-multidaily_local.t rename to tests/functional/cyclers/20-multidaily_local.t diff --git a/tests/cyclers/21-360_calendar.t b/tests/functional/cyclers/21-360_calendar.t similarity index 100% rename from tests/cyclers/21-360_calendar.t rename to tests/functional/cyclers/21-360_calendar.t diff --git a/tests/cyclers/21-360_calendar/graph.plain.ref b/tests/functional/cyclers/21-360_calendar/graph.plain.ref similarity index 100% rename from tests/cyclers/21-360_calendar/graph.plain.ref rename to tests/functional/cyclers/21-360_calendar/graph.plain.ref diff --git a/tests/cyclers/21-360_calendar/reference.log b/tests/functional/cyclers/21-360_calendar/reference.log similarity index 100% rename from tests/cyclers/21-360_calendar/reference.log rename to tests/functional/cyclers/21-360_calendar/reference.log diff --git a/tests/cyclers/21-360_calendar/suite.rc b/tests/functional/cyclers/21-360_calendar/suite.rc similarity index 100% rename from tests/cyclers/21-360_calendar/suite.rc rename to tests/functional/cyclers/21-360_calendar/suite.rc diff --git a/tests/cyclers/25-aeon.t b/tests/functional/cyclers/25-aeon.t similarity index 100% rename from tests/cyclers/25-aeon.t rename to tests/functional/cyclers/25-aeon.t diff --git a/tests/cyclers/26-0000_rollunder.t b/tests/functional/cyclers/26-0000_rollunder.t similarity index 100% rename from tests/cyclers/26-0000_rollunder.t rename to tests/functional/cyclers/26-0000_rollunder.t diff --git a/tests/cyclers/27-9999_rollover.t b/tests/functional/cyclers/27-9999_rollover.t similarity index 100% rename from tests/cyclers/27-9999_rollover.t rename to tests/functional/cyclers/27-9999_rollover.t diff --git a/tests/cyclers/28-implicit-disallowed.t b/tests/functional/cyclers/28-implicit-disallowed.t similarity index 100% rename from tests/cyclers/28-implicit-disallowed.t rename to tests/functional/cyclers/28-implicit-disallowed.t diff --git a/tests/cyclers/28-implicit-disallowed/suite.rc b/tests/functional/cyclers/28-implicit-disallowed/suite.rc similarity index 100% rename from tests/cyclers/28-implicit-disallowed/suite.rc rename to tests/functional/cyclers/28-implicit-disallowed/suite.rc diff --git a/tests/cyclers/29-r1_restricted.t b/tests/functional/cyclers/29-r1_restricted.t similarity index 100% rename from tests/cyclers/29-r1_restricted.t rename to tests/functional/cyclers/29-r1_restricted.t diff --git a/tests/cyclers/31-rnone_reverse.t b/tests/functional/cyclers/31-rnone_reverse.t similarity index 100% rename from tests/cyclers/31-rnone_reverse.t rename to tests/functional/cyclers/31-rnone_reverse.t diff --git a/tests/cyclers/32-rmany_reverse.t b/tests/functional/cyclers/32-rmany_reverse.t similarity index 100% rename from tests/cyclers/32-rmany_reverse.t rename to tests/functional/cyclers/32-rmany_reverse.t diff --git a/tests/cyclers/33-integer1.t b/tests/functional/cyclers/33-integer1.t similarity index 100% rename from tests/cyclers/33-integer1.t rename to tests/functional/cyclers/33-integer1.t diff --git a/tests/cyclers/34-r1_initial_immortal.t b/tests/functional/cyclers/34-r1_initial_immortal.t similarity index 100% rename from tests/cyclers/34-r1_initial_immortal.t rename to tests/functional/cyclers/34-r1_initial_immortal.t diff --git a/tests/cyclers/35-day_of_week.t b/tests/functional/cyclers/35-day_of_week.t similarity index 100% rename from tests/cyclers/35-day_of_week.t rename to tests/functional/cyclers/35-day_of_week.t diff --git a/tests/cyclers/36-icp_fcp_notation.t b/tests/functional/cyclers/36-icp_fcp_notation.t similarity index 100% rename from tests/cyclers/36-icp_fcp_notation.t rename to tests/functional/cyclers/36-icp_fcp_notation.t diff --git a/tests/cyclers/36-icp_fcp_notation/reference.log b/tests/functional/cyclers/36-icp_fcp_notation/reference.log similarity index 100% rename from tests/cyclers/36-icp_fcp_notation/reference.log rename to tests/functional/cyclers/36-icp_fcp_notation/reference.log diff --git a/tests/cyclers/36-icp_fcp_notation/suite.rc b/tests/functional/cyclers/36-icp_fcp_notation/suite.rc similarity index 100% rename from tests/cyclers/36-icp_fcp_notation/suite.rc rename to tests/functional/cyclers/36-icp_fcp_notation/suite.rc diff --git a/tests/cyclers/37-exclusions.t b/tests/functional/cyclers/37-exclusions.t similarity index 100% rename from tests/cyclers/37-exclusions.t rename to tests/functional/cyclers/37-exclusions.t diff --git a/tests/cyclers/39-exclusions_advanced.t b/tests/functional/cyclers/39-exclusions_advanced.t similarity index 100% rename from tests/cyclers/39-exclusions_advanced.t rename to tests/functional/cyclers/39-exclusions_advanced.t diff --git a/tests/cyclers/40-integer_exclusions_advanced.t b/tests/functional/cyclers/40-integer_exclusions_advanced.t similarity index 100% rename from tests/cyclers/40-integer_exclusions_advanced.t rename to tests/functional/cyclers/40-integer_exclusions_advanced.t diff --git a/tests/cyclers/47-icp_fcp_notation.t b/tests/functional/cyclers/47-icp_fcp_notation.t similarity index 100% rename from tests/cyclers/47-icp_fcp_notation.t rename to tests/functional/cyclers/47-icp_fcp_notation.t diff --git a/tests/cyclers/47-icp_fcp_notation/suite.rc b/tests/functional/cyclers/47-icp_fcp_notation/suite.rc similarity index 100% rename from tests/cyclers/47-icp_fcp_notation/suite.rc rename to tests/functional/cyclers/47-icp_fcp_notation/suite.rc diff --git a/tests/cyclers/48-icp-cutoff.t b/tests/functional/cyclers/48-icp-cutoff.t similarity index 100% rename from tests/cyclers/48-icp-cutoff.t rename to tests/functional/cyclers/48-icp-cutoff.t diff --git a/tests/cyclers/49-365_calendar.t b/tests/functional/cyclers/49-365_calendar.t similarity index 100% rename from tests/cyclers/49-365_calendar.t rename to tests/functional/cyclers/49-365_calendar.t diff --git a/tests/cyclers/49-365_calendar/graph.plain.ref b/tests/functional/cyclers/49-365_calendar/graph.plain.ref similarity index 100% rename from tests/cyclers/49-365_calendar/graph.plain.ref rename to tests/functional/cyclers/49-365_calendar/graph.plain.ref diff --git a/tests/cyclers/49-365_calendar/reference.log b/tests/functional/cyclers/49-365_calendar/reference.log similarity index 100% rename from tests/cyclers/49-365_calendar/reference.log rename to tests/functional/cyclers/49-365_calendar/reference.log diff --git a/tests/cyclers/49-365_calendar/suite.rc b/tests/functional/cyclers/49-365_calendar/suite.rc similarity index 100% rename from tests/cyclers/49-365_calendar/suite.rc rename to tests/functional/cyclers/49-365_calendar/suite.rc diff --git a/tests/cyclers/50-366_calendar.t b/tests/functional/cyclers/50-366_calendar.t similarity index 100% rename from tests/cyclers/50-366_calendar.t rename to tests/functional/cyclers/50-366_calendar.t diff --git a/tests/cyclers/50-366_calendar/graph.plain.ref b/tests/functional/cyclers/50-366_calendar/graph.plain.ref similarity index 100% rename from tests/cyclers/50-366_calendar/graph.plain.ref rename to tests/functional/cyclers/50-366_calendar/graph.plain.ref diff --git a/tests/cyclers/50-366_calendar/reference.log b/tests/functional/cyclers/50-366_calendar/reference.log similarity index 100% rename from tests/cyclers/50-366_calendar/reference.log rename to tests/functional/cyclers/50-366_calendar/reference.log diff --git a/tests/cyclers/50-366_calendar/suite.rc b/tests/functional/cyclers/50-366_calendar/suite.rc similarity index 100% rename from tests/cyclers/50-366_calendar/suite.rc rename to tests/functional/cyclers/50-366_calendar/suite.rc diff --git a/tests/cyclers/9999_rollover/suite.rc b/tests/functional/cyclers/9999_rollover/suite.rc similarity index 100% rename from tests/cyclers/9999_rollover/suite.rc rename to tests/functional/cyclers/9999_rollover/suite.rc diff --git a/tests/cyclers/aeon/graph.plain.ref b/tests/functional/cyclers/aeon/graph.plain.ref similarity index 100% rename from tests/cyclers/aeon/graph.plain.ref rename to tests/functional/cyclers/aeon/graph.plain.ref diff --git a/tests/cyclers/aeon/reference.log b/tests/functional/cyclers/aeon/reference.log similarity index 100% rename from tests/cyclers/aeon/reference.log rename to tests/functional/cyclers/aeon/reference.log diff --git a/tests/cyclers/aeon/suite.rc b/tests/functional/cyclers/aeon/suite.rc similarity index 100% rename from tests/cyclers/aeon/suite.rc rename to tests/functional/cyclers/aeon/suite.rc diff --git a/tests/cyclers/daily/graph.plain.ref b/tests/functional/cyclers/daily/graph.plain.ref similarity index 100% rename from tests/cyclers/daily/graph.plain.ref rename to tests/functional/cyclers/daily/graph.plain.ref diff --git a/tests/cyclers/daily/reference.log b/tests/functional/cyclers/daily/reference.log similarity index 100% rename from tests/cyclers/daily/reference.log rename to tests/functional/cyclers/daily/reference.log diff --git a/tests/cyclers/daily/suite.rc b/tests/functional/cyclers/daily/suite.rc similarity index 100% rename from tests/cyclers/daily/suite.rc rename to tests/functional/cyclers/daily/suite.rc diff --git a/tests/cyclers/daily_final/graph.plain.ref b/tests/functional/cyclers/daily_final/graph.plain.ref similarity index 100% rename from tests/cyclers/daily_final/graph.plain.ref rename to tests/functional/cyclers/daily_final/graph.plain.ref diff --git a/tests/cyclers/daily_final/reference.log b/tests/functional/cyclers/daily_final/reference.log similarity index 100% rename from tests/cyclers/daily_final/reference.log rename to tests/functional/cyclers/daily_final/reference.log diff --git a/tests/cyclers/daily_final/suite.rc b/tests/functional/cyclers/daily_final/suite.rc similarity index 100% rename from tests/cyclers/daily_final/suite.rc rename to tests/functional/cyclers/daily_final/suite.rc diff --git a/tests/cyclers/day_of_week/graph.plain.ref b/tests/functional/cyclers/day_of_week/graph.plain.ref similarity index 100% rename from tests/cyclers/day_of_week/graph.plain.ref rename to tests/functional/cyclers/day_of_week/graph.plain.ref diff --git a/tests/cyclers/day_of_week/reference.log b/tests/functional/cyclers/day_of_week/reference.log similarity index 100% rename from tests/cyclers/day_of_week/reference.log rename to tests/functional/cyclers/day_of_week/reference.log diff --git a/tests/cyclers/day_of_week/suite.rc b/tests/functional/cyclers/day_of_week/suite.rc similarity index 100% rename from tests/cyclers/day_of_week/suite.rc rename to tests/functional/cyclers/day_of_week/suite.rc diff --git a/tests/cyclers/exclusions/graph.plain.ref b/tests/functional/cyclers/exclusions/graph.plain.ref similarity index 100% rename from tests/cyclers/exclusions/graph.plain.ref rename to tests/functional/cyclers/exclusions/graph.plain.ref diff --git a/tests/cyclers/exclusions/reference.log b/tests/functional/cyclers/exclusions/reference.log similarity index 100% rename from tests/cyclers/exclusions/reference.log rename to tests/functional/cyclers/exclusions/reference.log diff --git a/tests/cyclers/exclusions/suite.rc b/tests/functional/cyclers/exclusions/suite.rc similarity index 100% rename from tests/cyclers/exclusions/suite.rc rename to tests/functional/cyclers/exclusions/suite.rc diff --git a/tests/cyclers/exclusions_advanced/graph.plain.ref b/tests/functional/cyclers/exclusions_advanced/graph.plain.ref similarity index 100% rename from tests/cyclers/exclusions_advanced/graph.plain.ref rename to tests/functional/cyclers/exclusions_advanced/graph.plain.ref diff --git a/tests/cyclers/exclusions_advanced/reference.log b/tests/functional/cyclers/exclusions_advanced/reference.log similarity index 100% rename from tests/cyclers/exclusions_advanced/reference.log rename to tests/functional/cyclers/exclusions_advanced/reference.log diff --git a/tests/cyclers/exclusions_advanced/suite.rc b/tests/functional/cyclers/exclusions_advanced/suite.rc similarity index 100% rename from tests/cyclers/exclusions_advanced/suite.rc rename to tests/functional/cyclers/exclusions_advanced/suite.rc diff --git a/tests/cyclers/hourly/graph.plain.ref b/tests/functional/cyclers/hourly/graph.plain.ref similarity index 100% rename from tests/cyclers/hourly/graph.plain.ref rename to tests/functional/cyclers/hourly/graph.plain.ref diff --git a/tests/cyclers/hourly/reference.log b/tests/functional/cyclers/hourly/reference.log similarity index 100% rename from tests/cyclers/hourly/reference.log rename to tests/functional/cyclers/hourly/reference.log diff --git a/tests/cyclers/hourly/suite.rc b/tests/functional/cyclers/hourly/suite.rc similarity index 100% rename from tests/cyclers/hourly/suite.rc rename to tests/functional/cyclers/hourly/suite.rc diff --git a/tests/cyclers/integer1/graph.plain.ref b/tests/functional/cyclers/integer1/graph.plain.ref similarity index 100% rename from tests/cyclers/integer1/graph.plain.ref rename to tests/functional/cyclers/integer1/graph.plain.ref diff --git a/tests/cyclers/integer1/reference.log b/tests/functional/cyclers/integer1/reference.log similarity index 100% rename from tests/cyclers/integer1/reference.log rename to tests/functional/cyclers/integer1/reference.log diff --git a/tests/cyclers/integer1/suite.rc b/tests/functional/cyclers/integer1/suite.rc similarity index 100% rename from tests/cyclers/integer1/suite.rc rename to tests/functional/cyclers/integer1/suite.rc diff --git a/tests/cyclers/integer_exclusions_advanced/graph.plain.ref b/tests/functional/cyclers/integer_exclusions_advanced/graph.plain.ref similarity index 100% rename from tests/cyclers/integer_exclusions_advanced/graph.plain.ref rename to tests/functional/cyclers/integer_exclusions_advanced/graph.plain.ref diff --git a/tests/cyclers/integer_exclusions_advanced/reference.log b/tests/functional/cyclers/integer_exclusions_advanced/reference.log similarity index 100% rename from tests/cyclers/integer_exclusions_advanced/reference.log rename to tests/functional/cyclers/integer_exclusions_advanced/reference.log diff --git a/tests/cyclers/integer_exclusions_advanced/suite.rc b/tests/functional/cyclers/integer_exclusions_advanced/suite.rc similarity index 100% rename from tests/cyclers/integer_exclusions_advanced/suite.rc rename to tests/functional/cyclers/integer_exclusions_advanced/suite.rc diff --git a/tests/cyclers/monthly/graph.plain.ref b/tests/functional/cyclers/monthly/graph.plain.ref similarity index 100% rename from tests/cyclers/monthly/graph.plain.ref rename to tests/functional/cyclers/monthly/graph.plain.ref diff --git a/tests/cyclers/monthly/reference.log b/tests/functional/cyclers/monthly/reference.log similarity index 100% rename from tests/cyclers/monthly/reference.log rename to tests/functional/cyclers/monthly/reference.log diff --git a/tests/cyclers/monthly/suite.rc b/tests/functional/cyclers/monthly/suite.rc similarity index 100% rename from tests/cyclers/monthly/suite.rc rename to tests/functional/cyclers/monthly/suite.rc diff --git a/tests/cyclers/monthly_complex/reference.log b/tests/functional/cyclers/monthly_complex/reference.log similarity index 100% rename from tests/cyclers/monthly_complex/reference.log rename to tests/functional/cyclers/monthly_complex/reference.log diff --git a/tests/cyclers/monthly_complex/suite.rc b/tests/functional/cyclers/monthly_complex/suite.rc similarity index 100% rename from tests/cyclers/monthly_complex/suite.rc rename to tests/functional/cyclers/monthly_complex/suite.rc diff --git a/tests/cyclers/multidaily/graph.plain.ref b/tests/functional/cyclers/multidaily/graph.plain.ref similarity index 100% rename from tests/cyclers/multidaily/graph.plain.ref rename to tests/functional/cyclers/multidaily/graph.plain.ref diff --git a/tests/cyclers/multidaily/reference.log b/tests/functional/cyclers/multidaily/reference.log similarity index 100% rename from tests/cyclers/multidaily/reference.log rename to tests/functional/cyclers/multidaily/reference.log diff --git a/tests/cyclers/multidaily/suite.rc b/tests/functional/cyclers/multidaily/suite.rc similarity index 100% rename from tests/cyclers/multidaily/suite.rc rename to tests/functional/cyclers/multidaily/suite.rc diff --git a/tests/cyclers/multidaily_local/graph.plain.ref b/tests/functional/cyclers/multidaily_local/graph.plain.ref similarity index 100% rename from tests/cyclers/multidaily_local/graph.plain.ref rename to tests/functional/cyclers/multidaily_local/graph.plain.ref diff --git a/tests/cyclers/multidaily_local/reference.log b/tests/functional/cyclers/multidaily_local/reference.log similarity index 100% rename from tests/cyclers/multidaily_local/reference.log rename to tests/functional/cyclers/multidaily_local/reference.log diff --git a/tests/cyclers/multidaily_local/suite.rc b/tests/functional/cyclers/multidaily_local/suite.rc similarity index 100% rename from tests/cyclers/multidaily_local/suite.rc rename to tests/functional/cyclers/multidaily_local/suite.rc diff --git a/tests/cyclers/multihourly/graph.plain.ref b/tests/functional/cyclers/multihourly/graph.plain.ref similarity index 100% rename from tests/cyclers/multihourly/graph.plain.ref rename to tests/functional/cyclers/multihourly/graph.plain.ref diff --git a/tests/cyclers/multihourly/reference.log b/tests/functional/cyclers/multihourly/reference.log similarity index 100% rename from tests/cyclers/multihourly/reference.log rename to tests/functional/cyclers/multihourly/reference.log diff --git a/tests/cyclers/multihourly/suite.rc b/tests/functional/cyclers/multihourly/suite.rc similarity index 100% rename from tests/cyclers/multihourly/suite.rc rename to tests/functional/cyclers/multihourly/suite.rc diff --git a/tests/cyclers/multimonthly/graph.plain.ref b/tests/functional/cyclers/multimonthly/graph.plain.ref similarity index 100% rename from tests/cyclers/multimonthly/graph.plain.ref rename to tests/functional/cyclers/multimonthly/graph.plain.ref diff --git a/tests/cyclers/multimonthly/reference.log b/tests/functional/cyclers/multimonthly/reference.log similarity index 100% rename from tests/cyclers/multimonthly/reference.log rename to tests/functional/cyclers/multimonthly/reference.log diff --git a/tests/cyclers/multimonthly/suite.rc b/tests/functional/cyclers/multimonthly/suite.rc similarity index 100% rename from tests/cyclers/multimonthly/suite.rc rename to tests/functional/cyclers/multimonthly/suite.rc diff --git a/tests/cyclers/multiweekly/graph.plain.ref b/tests/functional/cyclers/multiweekly/graph.plain.ref similarity index 100% rename from tests/cyclers/multiweekly/graph.plain.ref rename to tests/functional/cyclers/multiweekly/graph.plain.ref diff --git a/tests/cyclers/multiweekly/reference.log b/tests/functional/cyclers/multiweekly/reference.log similarity index 100% rename from tests/cyclers/multiweekly/reference.log rename to tests/functional/cyclers/multiweekly/reference.log diff --git a/tests/cyclers/multiweekly/suite.rc b/tests/functional/cyclers/multiweekly/suite.rc similarity index 100% rename from tests/cyclers/multiweekly/suite.rc rename to tests/functional/cyclers/multiweekly/suite.rc diff --git a/tests/cyclers/multiyearly/graph.plain.ref b/tests/functional/cyclers/multiyearly/graph.plain.ref similarity index 100% rename from tests/cyclers/multiyearly/graph.plain.ref rename to tests/functional/cyclers/multiyearly/graph.plain.ref diff --git a/tests/cyclers/multiyearly/reference.log b/tests/functional/cyclers/multiyearly/reference.log similarity index 100% rename from tests/cyclers/multiyearly/reference.log rename to tests/functional/cyclers/multiyearly/reference.log diff --git a/tests/cyclers/multiyearly/suite.rc b/tests/functional/cyclers/multiyearly/suite.rc similarity index 100% rename from tests/cyclers/multiyearly/suite.rc rename to tests/functional/cyclers/multiyearly/suite.rc diff --git a/tests/cyclers/offset_final/graph.plain.ref b/tests/functional/cyclers/offset_final/graph.plain.ref similarity index 100% rename from tests/cyclers/offset_final/graph.plain.ref rename to tests/functional/cyclers/offset_final/graph.plain.ref diff --git a/tests/cyclers/offset_final/reference.log b/tests/functional/cyclers/offset_final/reference.log similarity index 100% rename from tests/cyclers/offset_final/reference.log rename to tests/functional/cyclers/offset_final/reference.log diff --git a/tests/cyclers/offset_final/suite.rc b/tests/functional/cyclers/offset_final/suite.rc similarity index 100% rename from tests/cyclers/offset_final/suite.rc rename to tests/functional/cyclers/offset_final/suite.rc diff --git a/tests/cyclers/offset_initial/graph.plain.ref b/tests/functional/cyclers/offset_initial/graph.plain.ref similarity index 100% rename from tests/cyclers/offset_initial/graph.plain.ref rename to tests/functional/cyclers/offset_initial/graph.plain.ref diff --git a/tests/cyclers/offset_initial/reference.log b/tests/functional/cyclers/offset_initial/reference.log similarity index 100% rename from tests/cyclers/offset_initial/reference.log rename to tests/functional/cyclers/offset_initial/reference.log diff --git a/tests/cyclers/offset_initial/suite.rc b/tests/functional/cyclers/offset_initial/suite.rc similarity index 100% rename from tests/cyclers/offset_initial/suite.rc rename to tests/functional/cyclers/offset_initial/suite.rc diff --git a/tests/cyclers/r1_final/graph.plain.ref b/tests/functional/cyclers/r1_final/graph.plain.ref similarity index 100% rename from tests/cyclers/r1_final/graph.plain.ref rename to tests/functional/cyclers/r1_final/graph.plain.ref diff --git a/tests/cyclers/r1_final/reference.log b/tests/functional/cyclers/r1_final/reference.log similarity index 100% rename from tests/cyclers/r1_final/reference.log rename to tests/functional/cyclers/r1_final/reference.log diff --git a/tests/cyclers/r1_final/suite.rc b/tests/functional/cyclers/r1_final/suite.rc similarity index 100% rename from tests/cyclers/r1_final/suite.rc rename to tests/functional/cyclers/r1_final/suite.rc diff --git a/tests/cyclers/r1_initial/graph.plain.ref b/tests/functional/cyclers/r1_initial/graph.plain.ref similarity index 100% rename from tests/cyclers/r1_initial/graph.plain.ref rename to tests/functional/cyclers/r1_initial/graph.plain.ref diff --git a/tests/cyclers/r1_initial/reference.log b/tests/functional/cyclers/r1_initial/reference.log similarity index 100% rename from tests/cyclers/r1_initial/reference.log rename to tests/functional/cyclers/r1_initial/reference.log diff --git a/tests/cyclers/r1_initial/suite.rc b/tests/functional/cyclers/r1_initial/suite.rc similarity index 100% rename from tests/cyclers/r1_initial/suite.rc rename to tests/functional/cyclers/r1_initial/suite.rc diff --git a/tests/cyclers/r1_initial_back_comp_standalone_line/graph.plain.ref b/tests/functional/cyclers/r1_initial_back_comp_standalone_line/graph.plain.ref similarity index 100% rename from tests/cyclers/r1_initial_back_comp_standalone_line/graph.plain.ref rename to tests/functional/cyclers/r1_initial_back_comp_standalone_line/graph.plain.ref diff --git a/tests/cyclers/r1_initial_back_comp_standalone_line/reference.log b/tests/functional/cyclers/r1_initial_back_comp_standalone_line/reference.log similarity index 100% rename from tests/cyclers/r1_initial_back_comp_standalone_line/reference.log rename to tests/functional/cyclers/r1_initial_back_comp_standalone_line/reference.log diff --git a/tests/cyclers/r1_initial_back_comp_standalone_line/suite.rc b/tests/functional/cyclers/r1_initial_back_comp_standalone_line/suite.rc similarity index 100% rename from tests/cyclers/r1_initial_back_comp_standalone_line/suite.rc rename to tests/functional/cyclers/r1_initial_back_comp_standalone_line/suite.rc diff --git a/tests/cyclers/r1_initial_immortal/graph.plain.ref b/tests/functional/cyclers/r1_initial_immortal/graph.plain.ref similarity index 100% rename from tests/cyclers/r1_initial_immortal/graph.plain.ref rename to tests/functional/cyclers/r1_initial_immortal/graph.plain.ref diff --git a/tests/cyclers/r1_initial_immortal/reference.log b/tests/functional/cyclers/r1_initial_immortal/reference.log similarity index 100% rename from tests/cyclers/r1_initial_immortal/reference.log rename to tests/functional/cyclers/r1_initial_immortal/reference.log diff --git a/tests/cyclers/r1_initial_immortal/suite.rc b/tests/functional/cyclers/r1_initial_immortal/suite.rc similarity index 100% rename from tests/cyclers/r1_initial_immortal/suite.rc rename to tests/functional/cyclers/r1_initial_immortal/suite.rc diff --git a/tests/cyclers/r1_middle/graph.plain.ref b/tests/functional/cyclers/r1_middle/graph.plain.ref similarity index 100% rename from tests/cyclers/r1_middle/graph.plain.ref rename to tests/functional/cyclers/r1_middle/graph.plain.ref diff --git a/tests/cyclers/r1_middle/reference.log b/tests/functional/cyclers/r1_middle/reference.log similarity index 100% rename from tests/cyclers/r1_middle/reference.log rename to tests/functional/cyclers/r1_middle/reference.log diff --git a/tests/cyclers/r1_middle/suite.rc b/tests/functional/cyclers/r1_middle/suite.rc similarity index 100% rename from tests/cyclers/r1_middle/suite.rc rename to tests/functional/cyclers/r1_middle/suite.rc diff --git a/tests/cyclers/r1_multi_start/graph.plain.ref b/tests/functional/cyclers/r1_multi_start/graph.plain.ref similarity index 100% rename from tests/cyclers/r1_multi_start/graph.plain.ref rename to tests/functional/cyclers/r1_multi_start/graph.plain.ref diff --git a/tests/cyclers/r1_multi_start/reference.log b/tests/functional/cyclers/r1_multi_start/reference.log similarity index 100% rename from tests/cyclers/r1_multi_start/reference.log rename to tests/functional/cyclers/r1_multi_start/reference.log diff --git a/tests/cyclers/r1_multi_start/suite.rc b/tests/functional/cyclers/r1_multi_start/suite.rc similarity index 100% rename from tests/cyclers/r1_multi_start/suite.rc rename to tests/functional/cyclers/r1_multi_start/suite.rc diff --git a/tests/cyclers/r1_restricted/graph.plain.ref b/tests/functional/cyclers/r1_restricted/graph.plain.ref similarity index 100% rename from tests/cyclers/r1_restricted/graph.plain.ref rename to tests/functional/cyclers/r1_restricted/graph.plain.ref diff --git a/tests/cyclers/r1_restricted/reference.log b/tests/functional/cyclers/r1_restricted/reference.log similarity index 100% rename from tests/cyclers/r1_restricted/reference.log rename to tests/functional/cyclers/r1_restricted/reference.log diff --git a/tests/cyclers/r1_restricted/suite.rc b/tests/functional/cyclers/r1_restricted/suite.rc similarity index 100% rename from tests/cyclers/r1_restricted/suite.rc rename to tests/functional/cyclers/r1_restricted/suite.rc diff --git a/tests/cyclers/r5_final/graph.plain.ref b/tests/functional/cyclers/r5_final/graph.plain.ref similarity index 100% rename from tests/cyclers/r5_final/graph.plain.ref rename to tests/functional/cyclers/r5_final/graph.plain.ref diff --git a/tests/cyclers/r5_final/reference.log b/tests/functional/cyclers/r5_final/reference.log similarity index 100% rename from tests/cyclers/r5_final/reference.log rename to tests/functional/cyclers/r5_final/reference.log diff --git a/tests/cyclers/r5_final/suite.rc b/tests/functional/cyclers/r5_final/suite.rc similarity index 100% rename from tests/cyclers/r5_final/suite.rc rename to tests/functional/cyclers/r5_final/suite.rc diff --git a/tests/cyclers/r5_initial/graph.plain.ref b/tests/functional/cyclers/r5_initial/graph.plain.ref similarity index 100% rename from tests/cyclers/r5_initial/graph.plain.ref rename to tests/functional/cyclers/r5_initial/graph.plain.ref diff --git a/tests/cyclers/r5_initial/reference.log b/tests/functional/cyclers/r5_initial/reference.log similarity index 100% rename from tests/cyclers/r5_initial/reference.log rename to tests/functional/cyclers/r5_initial/reference.log diff --git a/tests/cyclers/r5_initial/suite.rc b/tests/functional/cyclers/r5_initial/suite.rc similarity index 100% rename from tests/cyclers/r5_initial/suite.rc rename to tests/functional/cyclers/r5_initial/suite.rc diff --git a/tests/cyclers/rmany_reverse/graph.plain.ref b/tests/functional/cyclers/rmany_reverse/graph.plain.ref similarity index 100% rename from tests/cyclers/rmany_reverse/graph.plain.ref rename to tests/functional/cyclers/rmany_reverse/graph.plain.ref diff --git a/tests/cyclers/rmany_reverse/reference.log b/tests/functional/cyclers/rmany_reverse/reference.log similarity index 100% rename from tests/cyclers/rmany_reverse/reference.log rename to tests/functional/cyclers/rmany_reverse/reference.log diff --git a/tests/cyclers/rmany_reverse/suite.rc b/tests/functional/cyclers/rmany_reverse/suite.rc similarity index 100% rename from tests/cyclers/rmany_reverse/suite.rc rename to tests/functional/cyclers/rmany_reverse/suite.rc diff --git a/tests/cyclers/rnone_reverse/graph.plain.ref b/tests/functional/cyclers/rnone_reverse/graph.plain.ref similarity index 100% rename from tests/cyclers/rnone_reverse/graph.plain.ref rename to tests/functional/cyclers/rnone_reverse/graph.plain.ref diff --git a/tests/cyclers/rnone_reverse/reference.log b/tests/functional/cyclers/rnone_reverse/reference.log similarity index 100% rename from tests/cyclers/rnone_reverse/reference.log rename to tests/functional/cyclers/rnone_reverse/reference.log diff --git a/tests/cyclers/rnone_reverse/suite.rc b/tests/functional/cyclers/rnone_reverse/suite.rc similarity index 100% rename from tests/cyclers/rnone_reverse/suite.rc rename to tests/functional/cyclers/rnone_reverse/suite.rc diff --git a/tests/cyclers/subhourly/graph.plain.ref b/tests/functional/cyclers/subhourly/graph.plain.ref similarity index 100% rename from tests/cyclers/subhourly/graph.plain.ref rename to tests/functional/cyclers/subhourly/graph.plain.ref diff --git a/tests/cyclers/subhourly/reference.log b/tests/functional/cyclers/subhourly/reference.log similarity index 100% rename from tests/cyclers/subhourly/reference.log rename to tests/functional/cyclers/subhourly/reference.log diff --git a/tests/cyclers/subhourly/suite.rc b/tests/functional/cyclers/subhourly/suite.rc similarity index 100% rename from tests/cyclers/subhourly/suite.rc rename to tests/functional/cyclers/subhourly/suite.rc diff --git a/tests/cyclers/test_header b/tests/functional/cyclers/test_header similarity index 100% rename from tests/cyclers/test_header rename to tests/functional/cyclers/test_header diff --git a/tests/cyclers/weekly/graph.plain.ref b/tests/functional/cyclers/weekly/graph.plain.ref similarity index 100% rename from tests/cyclers/weekly/graph.plain.ref rename to tests/functional/cyclers/weekly/graph.plain.ref diff --git a/tests/cyclers/weekly/reference.log b/tests/functional/cyclers/weekly/reference.log similarity index 100% rename from tests/cyclers/weekly/reference.log rename to tests/functional/cyclers/weekly/reference.log diff --git a/tests/cyclers/weekly/suite.rc b/tests/functional/cyclers/weekly/suite.rc similarity index 100% rename from tests/cyclers/weekly/suite.rc rename to tests/functional/cyclers/weekly/suite.rc diff --git a/tests/cyclers/yearly/graph.plain.ref b/tests/functional/cyclers/yearly/graph.plain.ref similarity index 100% rename from tests/cyclers/yearly/graph.plain.ref rename to tests/functional/cyclers/yearly/graph.plain.ref diff --git a/tests/cyclers/yearly/reference.log b/tests/functional/cyclers/yearly/reference.log similarity index 100% rename from tests/cyclers/yearly/reference.log rename to tests/functional/cyclers/yearly/reference.log diff --git a/tests/cyclers/yearly/suite.rc b/tests/functional/cyclers/yearly/suite.rc similarity index 100% rename from tests/cyclers/yearly/suite.rc rename to tests/functional/cyclers/yearly/suite.rc diff --git a/tests/cylc-cat-log/00-local.t b/tests/functional/cylc-cat-log/00-local.t similarity index 100% rename from tests/cylc-cat-log/00-local.t rename to tests/functional/cylc-cat-log/00-local.t diff --git a/tests/cylc-cat-log/00-local/suite.rc b/tests/functional/cylc-cat-log/00-local/suite.rc similarity index 100% rename from tests/cylc-cat-log/00-local/suite.rc rename to tests/functional/cylc-cat-log/00-local/suite.rc diff --git a/tests/cylc-cat-log/01-remote.t b/tests/functional/cylc-cat-log/01-remote.t similarity index 100% rename from tests/cylc-cat-log/01-remote.t rename to tests/functional/cylc-cat-log/01-remote.t diff --git a/tests/cylc-cat-log/01-remote/suite.rc b/tests/functional/cylc-cat-log/01-remote/suite.rc similarity index 100% rename from tests/cylc-cat-log/01-remote/suite.rc rename to tests/functional/cylc-cat-log/01-remote/suite.rc diff --git a/tests/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t b/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t similarity index 100% rename from tests/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t rename to tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t diff --git a/tests/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/reference.log b/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/reference.log similarity index 100% rename from tests/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/reference.log rename to tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/reference.log diff --git a/tests/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/suite.rc b/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/suite.rc similarity index 100% rename from tests/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/suite.rc rename to tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/suite.rc diff --git a/tests/cylc-cat-log/03-bad-suite.t b/tests/functional/cylc-cat-log/03-bad-suite.t similarity index 100% rename from tests/cylc-cat-log/03-bad-suite.t rename to tests/functional/cylc-cat-log/03-bad-suite.t diff --git a/tests/cylc-cat-log/04-local-tail.t b/tests/functional/cylc-cat-log/04-local-tail.t similarity index 100% rename from tests/cylc-cat-log/04-local-tail.t rename to tests/functional/cylc-cat-log/04-local-tail.t diff --git a/tests/cylc-cat-log/04-local-tail/bin/my-tailer.sh b/tests/functional/cylc-cat-log/04-local-tail/bin/my-tailer.sh similarity index 100% rename from tests/cylc-cat-log/04-local-tail/bin/my-tailer.sh rename to tests/functional/cylc-cat-log/04-local-tail/bin/my-tailer.sh diff --git a/tests/cylc-cat-log/04-local-tail/suite.rc b/tests/functional/cylc-cat-log/04-local-tail/suite.rc similarity index 100% rename from tests/cylc-cat-log/04-local-tail/suite.rc rename to tests/functional/cylc-cat-log/04-local-tail/suite.rc diff --git a/tests/cylc-cat-log/05-remote-tail.t b/tests/functional/cylc-cat-log/05-remote-tail.t similarity index 100% rename from tests/cylc-cat-log/05-remote-tail.t rename to tests/functional/cylc-cat-log/05-remote-tail.t diff --git a/tests/cylc-cat-log/05-remote-tail/bin/my-tailer.sh b/tests/functional/cylc-cat-log/05-remote-tail/bin/my-tailer.sh similarity index 100% rename from tests/cylc-cat-log/05-remote-tail/bin/my-tailer.sh rename to tests/functional/cylc-cat-log/05-remote-tail/bin/my-tailer.sh diff --git a/tests/cylc-cat-log/05-remote-tail/suite.rc b/tests/functional/cylc-cat-log/05-remote-tail/suite.rc similarity index 100% rename from tests/cylc-cat-log/05-remote-tail/suite.rc rename to tests/functional/cylc-cat-log/05-remote-tail/suite.rc diff --git a/tests/cylc-cat-log/06-log-rotation.t b/tests/functional/cylc-cat-log/06-log-rotation.t similarity index 100% rename from tests/cylc-cat-log/06-log-rotation.t rename to tests/functional/cylc-cat-log/06-log-rotation.t diff --git a/tests/cylc-cat-log/07-editor.t b/tests/functional/cylc-cat-log/07-editor.t similarity index 100% rename from tests/cylc-cat-log/07-editor.t rename to tests/functional/cylc-cat-log/07-editor.t diff --git a/tests/cylc-cat-log/08-editor-remote.t b/tests/functional/cylc-cat-log/08-editor-remote.t similarity index 100% rename from tests/cylc-cat-log/08-editor-remote.t rename to tests/functional/cylc-cat-log/08-editor-remote.t diff --git a/tests/cylc-cat-log/09-cat-running.t b/tests/functional/cylc-cat-log/09-cat-running.t similarity index 100% rename from tests/cylc-cat-log/09-cat-running.t rename to tests/functional/cylc-cat-log/09-cat-running.t diff --git a/tests/cylc-cat-log/09-cat-running/reference.log b/tests/functional/cylc-cat-log/09-cat-running/reference.log similarity index 100% rename from tests/cylc-cat-log/09-cat-running/reference.log rename to tests/functional/cylc-cat-log/09-cat-running/reference.log diff --git a/tests/cylc-cat-log/09-cat-running/suite.rc b/tests/functional/cylc-cat-log/09-cat-running/suite.rc similarity index 100% rename from tests/cylc-cat-log/09-cat-running/suite.rc rename to tests/functional/cylc-cat-log/09-cat-running/suite.rc diff --git a/tests/cylc-cat-log/10-remote-no-retrieve.t b/tests/functional/cylc-cat-log/10-remote-no-retrieve.t similarity index 100% rename from tests/cylc-cat-log/10-remote-no-retrieve.t rename to tests/functional/cylc-cat-log/10-remote-no-retrieve.t diff --git a/tests/cylc-cat-log/11-remote-retrieve.t b/tests/functional/cylc-cat-log/11-remote-retrieve.t similarity index 100% rename from tests/cylc-cat-log/11-remote-retrieve.t rename to tests/functional/cylc-cat-log/11-remote-retrieve.t diff --git a/tests/cylc-cat-log/editor/bin/my-editor b/tests/functional/cylc-cat-log/editor/bin/my-editor similarity index 100% rename from tests/cylc-cat-log/editor/bin/my-editor rename to tests/functional/cylc-cat-log/editor/bin/my-editor diff --git a/tests/cylc-cat-log/editor/bin/run_tests.sh b/tests/functional/cylc-cat-log/editor/bin/run_tests.sh similarity index 100% rename from tests/cylc-cat-log/editor/bin/run_tests.sh rename to tests/functional/cylc-cat-log/editor/bin/run_tests.sh diff --git a/tests/cylc-cat-log/editor/suite.rc b/tests/functional/cylc-cat-log/editor/suite.rc similarity index 100% rename from tests/cylc-cat-log/editor/suite.rc rename to tests/functional/cylc-cat-log/editor/suite.rc diff --git a/tests/cylc-cat-log/remote-simple/suite.rc b/tests/functional/cylc-cat-log/remote-simple/suite.rc similarity index 100% rename from tests/cylc-cat-log/remote-simple/suite.rc rename to tests/functional/cylc-cat-log/remote-simple/suite.rc diff --git a/tests/cylc-cat-log/test_header b/tests/functional/cylc-cat-log/test_header similarity index 100% rename from tests/cylc-cat-log/test_header rename to tests/functional/cylc-cat-log/test_header diff --git a/tests/cylc-diff/00-basic.t b/tests/functional/cylc-diff/00-basic.t similarity index 100% rename from tests/cylc-diff/00-basic.t rename to tests/functional/cylc-diff/00-basic.t diff --git a/tests/cylc-diff/01-same.t b/tests/functional/cylc-diff/01-same.t similarity index 100% rename from tests/cylc-diff/01-same.t rename to tests/functional/cylc-diff/01-same.t diff --git a/tests/cylc-diff/02-identical.t b/tests/functional/cylc-diff/02-identical.t similarity index 100% rename from tests/cylc-diff/02-identical.t rename to tests/functional/cylc-diff/02-identical.t diff --git a/tests/cylc-diff/03-icp.t b/tests/functional/cylc-diff/03-icp.t similarity index 100% rename from tests/cylc-diff/03-icp.t rename to tests/functional/cylc-diff/03-icp.t diff --git a/tests/cylc-diff/04-icp-2.t b/tests/functional/cylc-diff/04-icp-2.t similarity index 100% rename from tests/cylc-diff/04-icp-2.t rename to tests/functional/cylc-diff/04-icp-2.t diff --git a/tests/cylc-diff/test_header b/tests/functional/cylc-diff/test_header similarity index 100% rename from tests/cylc-diff/test_header rename to tests/functional/cylc-diff/test_header diff --git a/tests/cylc-edit/00-basic.t b/tests/functional/cylc-edit/00-basic.t similarity index 100% rename from tests/cylc-edit/00-basic.t rename to tests/functional/cylc-edit/00-basic.t diff --git a/tests/cylc-edit/00-basic/bin/my-edit b/tests/functional/cylc-edit/00-basic/bin/my-edit similarity index 100% rename from tests/cylc-edit/00-basic/bin/my-edit rename to tests/functional/cylc-edit/00-basic/bin/my-edit diff --git a/tests/cylc-edit/00-basic/include/suite-runtime.rc b/tests/functional/cylc-edit/00-basic/include/suite-runtime.rc similarity index 100% rename from tests/cylc-edit/00-basic/include/suite-runtime.rc rename to tests/functional/cylc-edit/00-basic/include/suite-runtime.rc diff --git a/tests/cylc-edit/00-basic/include/suite-scheduling.rc b/tests/functional/cylc-edit/00-basic/include/suite-scheduling.rc similarity index 100% rename from tests/cylc-edit/00-basic/include/suite-scheduling.rc rename to tests/functional/cylc-edit/00-basic/include/suite-scheduling.rc diff --git a/tests/cylc-edit/00-basic/suite.rc b/tests/functional/cylc-edit/00-basic/suite.rc similarity index 100% rename from tests/cylc-edit/00-basic/suite.rc rename to tests/functional/cylc-edit/00-basic/suite.rc diff --git a/tests/cylc-edit/test_header b/tests/functional/cylc-edit/test_header similarity index 100% rename from tests/cylc-edit/test_header rename to tests/functional/cylc-edit/test_header diff --git a/tests/cylc-get-config/00-simple.t b/tests/functional/cylc-get-config/00-simple.t similarity index 100% rename from tests/cylc-get-config/00-simple.t rename to tests/functional/cylc-get-config/00-simple.t diff --git a/tests/cylc-get-config/00-simple/section1.stdout b/tests/functional/cylc-get-config/00-simple/section1.stdout similarity index 100% rename from tests/cylc-get-config/00-simple/section1.stdout rename to tests/functional/cylc-get-config/00-simple/section1.stdout diff --git a/tests/cylc-get-config/00-simple/section2.stdout b/tests/functional/cylc-get-config/00-simple/section2.stdout similarity index 100% rename from tests/cylc-get-config/00-simple/section2.stdout rename to tests/functional/cylc-get-config/00-simple/section2.stdout diff --git a/tests/cylc-get-config/00-simple/suite.rc b/tests/functional/cylc-get-config/00-simple/suite.rc similarity index 100% rename from tests/cylc-get-config/00-simple/suite.rc rename to tests/functional/cylc-get-config/00-simple/suite.rc diff --git a/tests/cylc-get-config/01-no-final.t b/tests/functional/cylc-get-config/01-no-final.t similarity index 100% rename from tests/cylc-get-config/01-no-final.t rename to tests/functional/cylc-get-config/01-no-final.t diff --git a/tests/cylc-get-config/01-no-final/suite.rc b/tests/functional/cylc-get-config/01-no-final/suite.rc similarity index 100% rename from tests/cylc-get-config/01-no-final/suite.rc rename to tests/functional/cylc-get-config/01-no-final/suite.rc diff --git a/tests/cylc-get-config/02-cycling.t b/tests/functional/cylc-get-config/02-cycling.t similarity index 100% rename from tests/cylc-get-config/02-cycling.t rename to tests/functional/cylc-get-config/02-cycling.t diff --git a/tests/cylc-get-config/02-cycling/suite.rc b/tests/functional/cylc-get-config/02-cycling/suite.rc similarity index 100% rename from tests/cylc-get-config/02-cycling/suite.rc rename to tests/functional/cylc-get-config/02-cycling/suite.rc diff --git a/tests/cylc-get-config/03-icp.t b/tests/functional/cylc-get-config/03-icp.t similarity index 100% rename from tests/cylc-get-config/03-icp.t rename to tests/functional/cylc-get-config/03-icp.t diff --git a/tests/cylc-get-config/05-param-vars.t b/tests/functional/cylc-get-config/05-param-vars.t similarity index 100% rename from tests/cylc-get-config/05-param-vars.t rename to tests/functional/cylc-get-config/05-param-vars.t diff --git a/tests/cylc-get-config/05-param-vars/suite.rc b/tests/functional/cylc-get-config/05-param-vars/suite.rc similarity index 100% rename from tests/cylc-get-config/05-param-vars/suite.rc rename to tests/functional/cylc-get-config/05-param-vars/suite.rc diff --git a/tests/cylc-get-config/06-compat.t b/tests/functional/cylc-get-config/06-compat.t similarity index 100% rename from tests/cylc-get-config/06-compat.t rename to tests/functional/cylc-get-config/06-compat.t diff --git a/tests/cylc-get-config/test_header b/tests/functional/cylc-get-config/test_header similarity index 100% rename from tests/cylc-get-config/test_header rename to tests/functional/cylc-get-config/test_header diff --git a/tests/cylc-get-cylc-version/00-basic.t b/tests/functional/cylc-get-cylc-version/00-basic.t similarity index 100% rename from tests/cylc-get-cylc-version/00-basic.t rename to tests/functional/cylc-get-cylc-version/00-basic.t diff --git a/tests/cylc-get-cylc-version/00-basic/reference.log b/tests/functional/cylc-get-cylc-version/00-basic/reference.log similarity index 100% rename from tests/cylc-get-cylc-version/00-basic/reference.log rename to tests/functional/cylc-get-cylc-version/00-basic/reference.log diff --git a/tests/cylc-get-cylc-version/00-basic/suite.rc b/tests/functional/cylc-get-cylc-version/00-basic/suite.rc similarity index 100% rename from tests/cylc-get-cylc-version/00-basic/suite.rc rename to tests/functional/cylc-get-cylc-version/00-basic/suite.rc diff --git a/tests/cylc-get-cylc-version/test_header b/tests/functional/cylc-get-cylc-version/test_header similarity index 100% rename from tests/cylc-get-cylc-version/test_header rename to tests/functional/cylc-get-cylc-version/test_header diff --git a/tests/cylc-get-host-metrics/test_header b/tests/functional/cylc-get-host-metrics/test_header similarity index 100% rename from tests/cylc-get-host-metrics/test_header rename to tests/functional/cylc-get-host-metrics/test_header diff --git a/tests/cylc-get-site-config/00-basic.t b/tests/functional/cylc-get-site-config/00-basic.t similarity index 100% rename from tests/cylc-get-site-config/00-basic.t rename to tests/functional/cylc-get-site-config/00-basic.t diff --git a/tests/cylc-get-site-config/01-defaults.t b/tests/functional/cylc-get-site-config/01-defaults.t similarity index 100% rename from tests/cylc-get-site-config/01-defaults.t rename to tests/functional/cylc-get-site-config/01-defaults.t diff --git a/tests/cylc-get-site-config/02-jinja2.t b/tests/functional/cylc-get-site-config/02-jinja2.t similarity index 100% rename from tests/cylc-get-site-config/02-jinja2.t rename to tests/functional/cylc-get-site-config/02-jinja2.t diff --git a/tests/cylc-get-site-config/03-host-bool-override.t b/tests/functional/cylc-get-site-config/03-host-bool-override.t similarity index 100% rename from tests/cylc-get-site-config/03-host-bool-override.t rename to tests/functional/cylc-get-site-config/03-host-bool-override.t diff --git a/tests/cylc-get-site-config/04-homeless.t b/tests/functional/cylc-get-site-config/04-homeless.t similarity index 100% rename from tests/cylc-get-site-config/04-homeless.t rename to tests/functional/cylc-get-site-config/04-homeless.t diff --git a/tests/cylc-get-site-config/05-host-bool-override.t b/tests/functional/cylc-get-site-config/05-host-bool-override.t similarity index 100% rename from tests/cylc-get-site-config/05-host-bool-override.t rename to tests/functional/cylc-get-site-config/05-host-bool-override.t diff --git a/tests/cylc-get-site-config/test_header b/tests/functional/cylc-get-site-config/test_header similarity index 100% rename from tests/cylc-get-site-config/test_header rename to tests/functional/cylc-get-site-config/test_header diff --git a/tests/cylc-get-suite-contact/00-basic.t b/tests/functional/cylc-get-suite-contact/00-basic.t similarity index 100% rename from tests/cylc-get-suite-contact/00-basic.t rename to tests/functional/cylc-get-suite-contact/00-basic.t diff --git a/tests/cylc-get-suite-contact/test_header b/tests/functional/cylc-get-suite-contact/test_header similarity index 100% rename from tests/cylc-get-suite-contact/test_header rename to tests/functional/cylc-get-suite-contact/test_header diff --git a/tests/cylc-graph-diff/00-simple-control/suite.rc b/tests/functional/cylc-graph-diff/00-simple-control/suite.rc similarity index 100% rename from tests/cylc-graph-diff/00-simple-control/suite.rc rename to tests/functional/cylc-graph-diff/00-simple-control/suite.rc diff --git a/tests/cylc-graph-diff/00-simple-diffs/suite.rc b/tests/functional/cylc-graph-diff/00-simple-diffs/suite.rc similarity index 100% rename from tests/cylc-graph-diff/00-simple-diffs/suite.rc rename to tests/functional/cylc-graph-diff/00-simple-diffs/suite.rc diff --git a/tests/cylc-graph-diff/00-simple-same b/tests/functional/cylc-graph-diff/00-simple-same similarity index 100% rename from tests/cylc-graph-diff/00-simple-same rename to tests/functional/cylc-graph-diff/00-simple-same diff --git a/tests/cylc-graph-diff/00-simple.t b/tests/functional/cylc-graph-diff/00-simple.t similarity index 100% rename from tests/cylc-graph-diff/00-simple.t rename to tests/functional/cylc-graph-diff/00-simple.t diff --git a/tests/cylc-graph-diff/01-icp.t b/tests/functional/cylc-graph-diff/01-icp.t similarity index 100% rename from tests/cylc-graph-diff/01-icp.t rename to tests/functional/cylc-graph-diff/01-icp.t diff --git a/tests/cylc-graph-diff/test_header b/tests/functional/cylc-graph-diff/test_header similarity index 100% rename from tests/cylc-graph-diff/test_header rename to tests/functional/cylc-graph-diff/test_header diff --git a/tests/cylc-insert/00-insert.t b/tests/functional/cylc-insert/00-insert.t similarity index 100% rename from tests/cylc-insert/00-insert.t rename to tests/functional/cylc-insert/00-insert.t diff --git a/tests/cylc-insert/00-insert/reference.log b/tests/functional/cylc-insert/00-insert/reference.log similarity index 100% rename from tests/cylc-insert/00-insert/reference.log rename to tests/functional/cylc-insert/00-insert/reference.log diff --git a/tests/cylc-insert/00-insert/suite.rc b/tests/functional/cylc-insert/00-insert/suite.rc similarity index 100% rename from tests/cylc-insert/00-insert/suite.rc rename to tests/functional/cylc-insert/00-insert/suite.rc diff --git a/tests/cylc-insert/01-insert-bad-cycle-point.t b/tests/functional/cylc-insert/01-insert-bad-cycle-point.t similarity index 100% rename from tests/cylc-insert/01-insert-bad-cycle-point.t rename to tests/functional/cylc-insert/01-insert-bad-cycle-point.t diff --git a/tests/cylc-insert/01-insert-bad-cycle-point/reference.log b/tests/functional/cylc-insert/01-insert-bad-cycle-point/reference.log similarity index 100% rename from tests/cylc-insert/01-insert-bad-cycle-point/reference.log rename to tests/functional/cylc-insert/01-insert-bad-cycle-point/reference.log diff --git a/tests/cylc-insert/01-insert-bad-cycle-point/suite.rc b/tests/functional/cylc-insert/01-insert-bad-cycle-point/suite.rc similarity index 100% rename from tests/cylc-insert/01-insert-bad-cycle-point/suite.rc rename to tests/functional/cylc-insert/01-insert-bad-cycle-point/suite.rc diff --git a/tests/cylc-insert/02-insert-bad-stop-cycle-point.t b/tests/functional/cylc-insert/02-insert-bad-stop-cycle-point.t similarity index 100% rename from tests/cylc-insert/02-insert-bad-stop-cycle-point.t rename to tests/functional/cylc-insert/02-insert-bad-stop-cycle-point.t diff --git a/tests/cylc-insert/02-insert-bad-stop-cycle-point/reference.log b/tests/functional/cylc-insert/02-insert-bad-stop-cycle-point/reference.log similarity index 100% rename from tests/cylc-insert/02-insert-bad-stop-cycle-point/reference.log rename to tests/functional/cylc-insert/02-insert-bad-stop-cycle-point/reference.log diff --git a/tests/cylc-insert/02-insert-bad-stop-cycle-point/suite.rc b/tests/functional/cylc-insert/02-insert-bad-stop-cycle-point/suite.rc similarity index 100% rename from tests/cylc-insert/02-insert-bad-stop-cycle-point/suite.rc rename to tests/functional/cylc-insert/02-insert-bad-stop-cycle-point/suite.rc diff --git a/tests/cylc-insert/03-insert-old.t b/tests/functional/cylc-insert/03-insert-old.t similarity index 100% rename from tests/cylc-insert/03-insert-old.t rename to tests/functional/cylc-insert/03-insert-old.t diff --git a/tests/cylc-insert/03-insert-old/reference.log b/tests/functional/cylc-insert/03-insert-old/reference.log similarity index 100% rename from tests/cylc-insert/03-insert-old/reference.log rename to tests/functional/cylc-insert/03-insert-old/reference.log diff --git a/tests/cylc-insert/03-insert-old/suite.rc b/tests/functional/cylc-insert/03-insert-old/suite.rc similarity index 100% rename from tests/cylc-insert/03-insert-old/suite.rc rename to tests/functional/cylc-insert/03-insert-old/suite.rc diff --git a/tests/cylc-insert/04-insert-family.t b/tests/functional/cylc-insert/04-insert-family.t similarity index 100% rename from tests/cylc-insert/04-insert-family.t rename to tests/functional/cylc-insert/04-insert-family.t diff --git a/tests/cylc-insert/04-insert-family/reference.log b/tests/functional/cylc-insert/04-insert-family/reference.log similarity index 100% rename from tests/cylc-insert/04-insert-family/reference.log rename to tests/functional/cylc-insert/04-insert-family/reference.log diff --git a/tests/cylc-insert/04-insert-family/suite.rc b/tests/functional/cylc-insert/04-insert-family/suite.rc similarity index 100% rename from tests/cylc-insert/04-insert-family/suite.rc rename to tests/functional/cylc-insert/04-insert-family/suite.rc diff --git a/tests/cylc-insert/05-insert-compat.t b/tests/functional/cylc-insert/05-insert-compat.t similarity index 100% rename from tests/cylc-insert/05-insert-compat.t rename to tests/functional/cylc-insert/05-insert-compat.t diff --git a/tests/cylc-insert/05-insert-compat/reference.log b/tests/functional/cylc-insert/05-insert-compat/reference.log similarity index 100% rename from tests/cylc-insert/05-insert-compat/reference.log rename to tests/functional/cylc-insert/05-insert-compat/reference.log diff --git a/tests/cylc-insert/05-insert-compat/suite.rc b/tests/functional/cylc-insert/05-insert-compat/suite.rc similarity index 100% rename from tests/cylc-insert/05-insert-compat/suite.rc rename to tests/functional/cylc-insert/05-insert-compat/suite.rc diff --git a/tests/cylc-insert/06-insert-bad-cycle-point-compat.t b/tests/functional/cylc-insert/06-insert-bad-cycle-point-compat.t similarity index 100% rename from tests/cylc-insert/06-insert-bad-cycle-point-compat.t rename to tests/functional/cylc-insert/06-insert-bad-cycle-point-compat.t diff --git a/tests/cylc-insert/06-insert-bad-cycle-point-compat/reference.log b/tests/functional/cylc-insert/06-insert-bad-cycle-point-compat/reference.log similarity index 100% rename from tests/cylc-insert/06-insert-bad-cycle-point-compat/reference.log rename to tests/functional/cylc-insert/06-insert-bad-cycle-point-compat/reference.log diff --git a/tests/cylc-insert/06-insert-bad-cycle-point-compat/suite.rc b/tests/functional/cylc-insert/06-insert-bad-cycle-point-compat/suite.rc similarity index 100% rename from tests/cylc-insert/06-insert-bad-cycle-point-compat/suite.rc rename to tests/functional/cylc-insert/06-insert-bad-cycle-point-compat/suite.rc diff --git a/tests/cylc-insert/07-insert-bad-stop-cycle-point.t b/tests/functional/cylc-insert/07-insert-bad-stop-cycle-point.t similarity index 100% rename from tests/cylc-insert/07-insert-bad-stop-cycle-point.t rename to tests/functional/cylc-insert/07-insert-bad-stop-cycle-point.t diff --git a/tests/cylc-insert/07-insert-bad-stop-cycle-point/reference.log b/tests/functional/cylc-insert/07-insert-bad-stop-cycle-point/reference.log similarity index 100% rename from tests/cylc-insert/07-insert-bad-stop-cycle-point/reference.log rename to tests/functional/cylc-insert/07-insert-bad-stop-cycle-point/reference.log diff --git a/tests/cylc-insert/07-insert-bad-stop-cycle-point/suite.rc b/tests/functional/cylc-insert/07-insert-bad-stop-cycle-point/suite.rc similarity index 100% rename from tests/cylc-insert/07-insert-bad-stop-cycle-point/suite.rc rename to tests/functional/cylc-insert/07-insert-bad-stop-cycle-point/suite.rc diff --git a/tests/cylc-insert/08-insert-family-compat.t b/tests/functional/cylc-insert/08-insert-family-compat.t similarity index 100% rename from tests/cylc-insert/08-insert-family-compat.t rename to tests/functional/cylc-insert/08-insert-family-compat.t diff --git a/tests/cylc-insert/08-insert-family-compat/reference.log b/tests/functional/cylc-insert/08-insert-family-compat/reference.log similarity index 100% rename from tests/cylc-insert/08-insert-family-compat/reference.log rename to tests/functional/cylc-insert/08-insert-family-compat/reference.log diff --git a/tests/cylc-insert/08-insert-family-compat/suite.rc b/tests/functional/cylc-insert/08-insert-family-compat/suite.rc similarity index 100% rename from tests/cylc-insert/08-insert-family-compat/suite.rc rename to tests/functional/cylc-insert/08-insert-family-compat/suite.rc diff --git a/tests/cylc-insert/09-insert-no-cycle-point.t b/tests/functional/cylc-insert/09-insert-no-cycle-point.t similarity index 100% rename from tests/cylc-insert/09-insert-no-cycle-point.t rename to tests/functional/cylc-insert/09-insert-no-cycle-point.t diff --git a/tests/cylc-insert/09-insert-no-cycle-point/reference.log b/tests/functional/cylc-insert/09-insert-no-cycle-point/reference.log similarity index 100% rename from tests/cylc-insert/09-insert-no-cycle-point/reference.log rename to tests/functional/cylc-insert/09-insert-no-cycle-point/reference.log diff --git a/tests/cylc-insert/09-insert-no-cycle-point/suite.rc b/tests/functional/cylc-insert/09-insert-no-cycle-point/suite.rc similarity index 100% rename from tests/cylc-insert/09-insert-no-cycle-point/suite.rc rename to tests/functional/cylc-insert/09-insert-no-cycle-point/suite.rc diff --git a/tests/cylc-insert/10-insert-non-graphed-cycle-point.t b/tests/functional/cylc-insert/10-insert-non-graphed-cycle-point.t similarity index 100% rename from tests/cylc-insert/10-insert-non-graphed-cycle-point.t rename to tests/functional/cylc-insert/10-insert-non-graphed-cycle-point.t diff --git a/tests/cylc-insert/10-insert-non-graphed-cycle-point/reference.log b/tests/functional/cylc-insert/10-insert-non-graphed-cycle-point/reference.log similarity index 100% rename from tests/cylc-insert/10-insert-non-graphed-cycle-point/reference.log rename to tests/functional/cylc-insert/10-insert-non-graphed-cycle-point/reference.log diff --git a/tests/cylc-insert/10-insert-non-graphed-cycle-point/suite.rc b/tests/functional/cylc-insert/10-insert-non-graphed-cycle-point/suite.rc similarity index 100% rename from tests/cylc-insert/10-insert-non-graphed-cycle-point/suite.rc rename to tests/functional/cylc-insert/10-insert-non-graphed-cycle-point/suite.rc diff --git a/tests/cylc-insert/11-wildcard.t b/tests/functional/cylc-insert/11-wildcard.t similarity index 100% rename from tests/cylc-insert/11-wildcard.t rename to tests/functional/cylc-insert/11-wildcard.t diff --git a/tests/cylc-insert/11-wildcard/reference.log b/tests/functional/cylc-insert/11-wildcard/reference.log similarity index 100% rename from tests/cylc-insert/11-wildcard/reference.log rename to tests/functional/cylc-insert/11-wildcard/reference.log diff --git a/tests/cylc-insert/11-wildcard/suite.rc b/tests/functional/cylc-insert/11-wildcard/suite.rc similarity index 100% rename from tests/cylc-insert/11-wildcard/suite.rc rename to tests/functional/cylc-insert/11-wildcard/suite.rc diff --git a/tests/cylc-insert/12-cycle-500-tasks.t b/tests/functional/cylc-insert/12-cycle-500-tasks.t similarity index 100% rename from tests/cylc-insert/12-cycle-500-tasks.t rename to tests/functional/cylc-insert/12-cycle-500-tasks.t diff --git a/tests/cylc-insert/12-cycle-500-tasks/reference.log b/tests/functional/cylc-insert/12-cycle-500-tasks/reference.log similarity index 100% rename from tests/cylc-insert/12-cycle-500-tasks/reference.log rename to tests/functional/cylc-insert/12-cycle-500-tasks/reference.log diff --git a/tests/cylc-insert/12-cycle-500-tasks/suite.rc b/tests/functional/cylc-insert/12-cycle-500-tasks/suite.rc similarity index 100% rename from tests/cylc-insert/12-cycle-500-tasks/suite.rc rename to tests/functional/cylc-insert/12-cycle-500-tasks/suite.rc diff --git a/tests/cylc-insert/13-family-submit-num.t b/tests/functional/cylc-insert/13-family-submit-num.t similarity index 100% rename from tests/cylc-insert/13-family-submit-num.t rename to tests/functional/cylc-insert/13-family-submit-num.t diff --git a/tests/cylc-insert/13-family-submit-num/reference.log b/tests/functional/cylc-insert/13-family-submit-num/reference.log similarity index 100% rename from tests/cylc-insert/13-family-submit-num/reference.log rename to tests/functional/cylc-insert/13-family-submit-num/reference.log diff --git a/tests/cylc-insert/13-family-submit-num/suite.rc b/tests/functional/cylc-insert/13-family-submit-num/suite.rc similarity index 100% rename from tests/cylc-insert/13-family-submit-num/suite.rc rename to tests/functional/cylc-insert/13-family-submit-num/suite.rc diff --git a/tests/cylc-insert/test_header b/tests/functional/cylc-insert/test_header similarity index 100% rename from tests/cylc-insert/test_header rename to tests/functional/cylc-insert/test_header diff --git a/tests/cylc-kill/00-multi-hosts-compat.t b/tests/functional/cylc-kill/00-multi-hosts-compat.t similarity index 100% rename from tests/cylc-kill/00-multi-hosts-compat.t rename to tests/functional/cylc-kill/00-multi-hosts-compat.t diff --git a/tests/cylc-kill/00-multi-hosts-compat/reference.log b/tests/functional/cylc-kill/00-multi-hosts-compat/reference.log similarity index 100% rename from tests/cylc-kill/00-multi-hosts-compat/reference.log rename to tests/functional/cylc-kill/00-multi-hosts-compat/reference.log diff --git a/tests/cylc-kill/00-multi-hosts-compat/suite.rc b/tests/functional/cylc-kill/00-multi-hosts-compat/suite.rc similarity index 100% rename from tests/cylc-kill/00-multi-hosts-compat/suite.rc rename to tests/functional/cylc-kill/00-multi-hosts-compat/suite.rc diff --git a/tests/cylc-kill/01-multi-hosts.t b/tests/functional/cylc-kill/01-multi-hosts.t similarity index 100% rename from tests/cylc-kill/01-multi-hosts.t rename to tests/functional/cylc-kill/01-multi-hosts.t diff --git a/tests/cylc-kill/01-multi-hosts/reference.log b/tests/functional/cylc-kill/01-multi-hosts/reference.log similarity index 100% rename from tests/cylc-kill/01-multi-hosts/reference.log rename to tests/functional/cylc-kill/01-multi-hosts/reference.log diff --git a/tests/cylc-kill/01-multi-hosts/suite.rc b/tests/functional/cylc-kill/01-multi-hosts/suite.rc similarity index 100% rename from tests/cylc-kill/01-multi-hosts/suite.rc rename to tests/functional/cylc-kill/01-multi-hosts/suite.rc diff --git a/tests/cylc-kill/test_header b/tests/functional/cylc-kill/test_header similarity index 100% rename from tests/cylc-kill/test_header rename to tests/functional/cylc-kill/test_header diff --git a/tests/cylc-list/00-options b/tests/functional/cylc-list/00-options similarity index 100% rename from tests/cylc-list/00-options rename to tests/functional/cylc-list/00-options diff --git a/tests/cylc-list/00-options.t b/tests/functional/cylc-list/00-options.t similarity index 100% rename from tests/cylc-list/00-options.t rename to tests/functional/cylc-list/00-options.t diff --git a/tests/cylc-list/01-icp.t b/tests/functional/cylc-list/01-icp.t similarity index 100% rename from tests/cylc-list/01-icp.t rename to tests/functional/cylc-list/01-icp.t diff --git a/tests/cylc-list/suite/suite.rc b/tests/functional/cylc-list/suite/suite.rc similarity index 100% rename from tests/cylc-list/suite/suite.rc rename to tests/functional/cylc-list/suite/suite.rc diff --git a/tests/cylc-list/test_header b/tests/functional/cylc-list/test_header similarity index 100% rename from tests/cylc-list/test_header rename to tests/functional/cylc-list/test_header diff --git a/tests/cylc-message/00-ssh.t b/tests/functional/cylc-message/00-ssh.t similarity index 100% rename from tests/cylc-message/00-ssh.t rename to tests/functional/cylc-message/00-ssh.t diff --git a/tests/cylc-message/00-ssh/reference.log b/tests/functional/cylc-message/00-ssh/reference.log similarity index 100% rename from tests/cylc-message/00-ssh/reference.log rename to tests/functional/cylc-message/00-ssh/reference.log diff --git a/tests/cylc-message/00-ssh/suite.rc b/tests/functional/cylc-message/00-ssh/suite.rc similarity index 100% rename from tests/cylc-message/00-ssh/suite.rc rename to tests/functional/cylc-message/00-ssh/suite.rc diff --git a/tests/cylc-message/01-newline.t b/tests/functional/cylc-message/01-newline.t similarity index 100% rename from tests/cylc-message/01-newline.t rename to tests/functional/cylc-message/01-newline.t diff --git a/tests/cylc-message/01-newline/suite.rc b/tests/functional/cylc-message/01-newline/suite.rc similarity index 100% rename from tests/cylc-message/01-newline/suite.rc rename to tests/functional/cylc-message/01-newline/suite.rc diff --git a/tests/cylc-message/02-multi.t b/tests/functional/cylc-message/02-multi.t similarity index 100% rename from tests/cylc-message/02-multi.t rename to tests/functional/cylc-message/02-multi.t diff --git a/tests/cylc-message/02-multi/suite.rc b/tests/functional/cylc-message/02-multi/suite.rc similarity index 100% rename from tests/cylc-message/02-multi/suite.rc rename to tests/functional/cylc-message/02-multi/suite.rc diff --git a/tests/cylc-message/test_header b/tests/functional/cylc-message/test_header similarity index 100% rename from tests/cylc-message/test_header rename to tests/functional/cylc-message/test_header diff --git a/tests/cylc-ping/00-simple.t b/tests/functional/cylc-ping/00-simple.t similarity index 100% rename from tests/cylc-ping/00-simple.t rename to tests/functional/cylc-ping/00-simple.t diff --git a/tests/cylc-ping/00-simple/reference.log b/tests/functional/cylc-ping/00-simple/reference.log similarity index 100% rename from tests/cylc-ping/00-simple/reference.log rename to tests/functional/cylc-ping/00-simple/reference.log diff --git a/tests/cylc-ping/00-simple/suite.rc b/tests/functional/cylc-ping/00-simple/suite.rc similarity index 100% rename from tests/cylc-ping/00-simple/suite.rc rename to tests/functional/cylc-ping/00-simple/suite.rc diff --git a/tests/cylc-ping/test_header b/tests/functional/cylc-ping/test_header similarity index 100% rename from tests/cylc-ping/test_header rename to tests/functional/cylc-ping/test_header diff --git a/tests/cylc-poll/00-basic.t b/tests/functional/cylc-poll/00-basic.t similarity index 100% rename from tests/cylc-poll/00-basic.t rename to tests/functional/cylc-poll/00-basic.t diff --git a/tests/cylc-poll/00-basic/reference.log b/tests/functional/cylc-poll/00-basic/reference.log similarity index 100% rename from tests/cylc-poll/00-basic/reference.log rename to tests/functional/cylc-poll/00-basic/reference.log diff --git a/tests/cylc-poll/00-basic/suite.rc b/tests/functional/cylc-poll/00-basic/suite.rc similarity index 100% rename from tests/cylc-poll/00-basic/suite.rc rename to tests/functional/cylc-poll/00-basic/suite.rc diff --git a/tests/cylc-poll/01-task-failed.t b/tests/functional/cylc-poll/01-task-failed.t similarity index 100% rename from tests/cylc-poll/01-task-failed.t rename to tests/functional/cylc-poll/01-task-failed.t diff --git a/tests/cylc-poll/01-task-failed/reference.log b/tests/functional/cylc-poll/01-task-failed/reference.log similarity index 100% rename from tests/cylc-poll/01-task-failed/reference.log rename to tests/functional/cylc-poll/01-task-failed/reference.log diff --git a/tests/cylc-poll/01-task-failed/suite.rc b/tests/functional/cylc-poll/01-task-failed/suite.rc similarity index 100% rename from tests/cylc-poll/01-task-failed/suite.rc rename to tests/functional/cylc-poll/01-task-failed/suite.rc diff --git a/tests/cylc-poll/02-task-submit-failed.t b/tests/functional/cylc-poll/02-task-submit-failed.t similarity index 100% rename from tests/cylc-poll/02-task-submit-failed.t rename to tests/functional/cylc-poll/02-task-submit-failed.t diff --git a/tests/cylc-poll/02-task-submit-failed/reference.log b/tests/functional/cylc-poll/02-task-submit-failed/reference.log similarity index 100% rename from tests/cylc-poll/02-task-submit-failed/reference.log rename to tests/functional/cylc-poll/02-task-submit-failed/reference.log diff --git a/tests/cylc-poll/02-task-submit-failed/suite.rc b/tests/functional/cylc-poll/02-task-submit-failed/suite.rc similarity index 100% rename from tests/cylc-poll/02-task-submit-failed/suite.rc rename to tests/functional/cylc-poll/02-task-submit-failed/suite.rc diff --git a/tests/cylc-poll/04-poll-multi-hosts.t b/tests/functional/cylc-poll/04-poll-multi-hosts.t similarity index 100% rename from tests/cylc-poll/04-poll-multi-hosts.t rename to tests/functional/cylc-poll/04-poll-multi-hosts.t diff --git a/tests/cylc-poll/04-poll-multi-hosts/reference.log b/tests/functional/cylc-poll/04-poll-multi-hosts/reference.log similarity index 100% rename from tests/cylc-poll/04-poll-multi-hosts/reference.log rename to tests/functional/cylc-poll/04-poll-multi-hosts/reference.log diff --git a/tests/cylc-poll/04-poll-multi-hosts/suite.rc b/tests/functional/cylc-poll/04-poll-multi-hosts/suite.rc similarity index 100% rename from tests/cylc-poll/04-poll-multi-hosts/suite.rc rename to tests/functional/cylc-poll/04-poll-multi-hosts/suite.rc diff --git a/tests/cylc-poll/05-poll-multi-messages.t b/tests/functional/cylc-poll/05-poll-multi-messages.t similarity index 100% rename from tests/cylc-poll/05-poll-multi-messages.t rename to tests/functional/cylc-poll/05-poll-multi-messages.t diff --git a/tests/cylc-poll/05-poll-multi-messages/reference.log b/tests/functional/cylc-poll/05-poll-multi-messages/reference.log similarity index 100% rename from tests/cylc-poll/05-poll-multi-messages/reference.log rename to tests/functional/cylc-poll/05-poll-multi-messages/reference.log diff --git a/tests/cylc-poll/05-poll-multi-messages/suite.rc b/tests/functional/cylc-poll/05-poll-multi-messages/suite.rc similarity index 100% rename from tests/cylc-poll/05-poll-multi-messages/suite.rc rename to tests/functional/cylc-poll/05-poll-multi-messages/suite.rc diff --git a/tests/cylc-poll/06-loadleveler.t b/tests/functional/cylc-poll/06-loadleveler.t similarity index 100% rename from tests/cylc-poll/06-loadleveler.t rename to tests/functional/cylc-poll/06-loadleveler.t diff --git a/tests/cylc-poll/06-loadleveler/reference.log b/tests/functional/cylc-poll/06-loadleveler/reference.log similarity index 100% rename from tests/cylc-poll/06-loadleveler/reference.log rename to tests/functional/cylc-poll/06-loadleveler/reference.log diff --git a/tests/cylc-poll/06-loadleveler/suite.rc b/tests/functional/cylc-poll/06-loadleveler/suite.rc similarity index 100% rename from tests/cylc-poll/06-loadleveler/suite.rc rename to tests/functional/cylc-poll/06-loadleveler/suite.rc diff --git a/tests/cylc-poll/07-pbs.t b/tests/functional/cylc-poll/07-pbs.t similarity index 100% rename from tests/cylc-poll/07-pbs.t rename to tests/functional/cylc-poll/07-pbs.t diff --git a/tests/cylc-poll/07-pbs/reference.log b/tests/functional/cylc-poll/07-pbs/reference.log similarity index 100% rename from tests/cylc-poll/07-pbs/reference.log rename to tests/functional/cylc-poll/07-pbs/reference.log diff --git a/tests/cylc-poll/07-pbs/suite.rc b/tests/functional/cylc-poll/07-pbs/suite.rc similarity index 100% rename from tests/cylc-poll/07-pbs/suite.rc rename to tests/functional/cylc-poll/07-pbs/suite.rc diff --git a/tests/cylc-poll/08-slurm.t b/tests/functional/cylc-poll/08-slurm.t similarity index 100% rename from tests/cylc-poll/08-slurm.t rename to tests/functional/cylc-poll/08-slurm.t diff --git a/tests/cylc-poll/08-slurm/reference.log b/tests/functional/cylc-poll/08-slurm/reference.log similarity index 100% rename from tests/cylc-poll/08-slurm/reference.log rename to tests/functional/cylc-poll/08-slurm/reference.log diff --git a/tests/cylc-poll/08-slurm/suite.rc b/tests/functional/cylc-poll/08-slurm/suite.rc similarity index 100% rename from tests/cylc-poll/08-slurm/suite.rc rename to tests/functional/cylc-poll/08-slurm/suite.rc diff --git a/tests/cylc-poll/09-lsf.t b/tests/functional/cylc-poll/09-lsf.t similarity index 100% rename from tests/cylc-poll/09-lsf.t rename to tests/functional/cylc-poll/09-lsf.t diff --git a/tests/cylc-poll/09-lsf/reference.log b/tests/functional/cylc-poll/09-lsf/reference.log similarity index 100% rename from tests/cylc-poll/09-lsf/reference.log rename to tests/functional/cylc-poll/09-lsf/reference.log diff --git a/tests/cylc-poll/09-lsf/suite.rc b/tests/functional/cylc-poll/09-lsf/suite.rc similarity index 100% rename from tests/cylc-poll/09-lsf/suite.rc rename to tests/functional/cylc-poll/09-lsf/suite.rc diff --git a/tests/cylc-poll/10-basic-compat.t b/tests/functional/cylc-poll/10-basic-compat.t similarity index 100% rename from tests/cylc-poll/10-basic-compat.t rename to tests/functional/cylc-poll/10-basic-compat.t diff --git a/tests/cylc-poll/10-basic-compat/reference.log b/tests/functional/cylc-poll/10-basic-compat/reference.log similarity index 100% rename from tests/cylc-poll/10-basic-compat/reference.log rename to tests/functional/cylc-poll/10-basic-compat/reference.log diff --git a/tests/cylc-poll/10-basic-compat/suite.rc b/tests/functional/cylc-poll/10-basic-compat/suite.rc similarity index 100% rename from tests/cylc-poll/10-basic-compat/suite.rc rename to tests/functional/cylc-poll/10-basic-compat/suite.rc diff --git a/tests/cylc-poll/11-event-time.t b/tests/functional/cylc-poll/11-event-time.t similarity index 100% rename from tests/cylc-poll/11-event-time.t rename to tests/functional/cylc-poll/11-event-time.t diff --git a/tests/cylc-poll/11-event-time/reference.log b/tests/functional/cylc-poll/11-event-time/reference.log similarity index 100% rename from tests/cylc-poll/11-event-time/reference.log rename to tests/functional/cylc-poll/11-event-time/reference.log diff --git a/tests/cylc-poll/11-event-time/suite.rc b/tests/functional/cylc-poll/11-event-time/suite.rc similarity index 100% rename from tests/cylc-poll/11-event-time/suite.rc rename to tests/functional/cylc-poll/11-event-time/suite.rc diff --git a/tests/cylc-poll/12-reverse-state.t b/tests/functional/cylc-poll/12-reverse-state.t similarity index 100% rename from tests/cylc-poll/12-reverse-state.t rename to tests/functional/cylc-poll/12-reverse-state.t diff --git a/tests/cylc-poll/12-reverse-state/reference.log b/tests/functional/cylc-poll/12-reverse-state/reference.log similarity index 100% rename from tests/cylc-poll/12-reverse-state/reference.log rename to tests/functional/cylc-poll/12-reverse-state/reference.log diff --git a/tests/cylc-poll/12-reverse-state/suite.rc b/tests/functional/cylc-poll/12-reverse-state/suite.rc similarity index 100% rename from tests/cylc-poll/12-reverse-state/suite.rc rename to tests/functional/cylc-poll/12-reverse-state/suite.rc diff --git a/tests/cylc-poll/13-comm-method.t b/tests/functional/cylc-poll/13-comm-method.t similarity index 100% rename from tests/cylc-poll/13-comm-method.t rename to tests/functional/cylc-poll/13-comm-method.t diff --git a/tests/cylc-poll/13-comm-method/reference.log b/tests/functional/cylc-poll/13-comm-method/reference.log similarity index 100% rename from tests/cylc-poll/13-comm-method/reference.log rename to tests/functional/cylc-poll/13-comm-method/reference.log diff --git a/tests/cylc-poll/13-comm-method/suite.rc b/tests/functional/cylc-poll/13-comm-method/suite.rc similarity index 100% rename from tests/cylc-poll/13-comm-method/suite.rc rename to tests/functional/cylc-poll/13-comm-method/suite.rc diff --git a/tests/cylc-poll/14-intervals.t b/tests/functional/cylc-poll/14-intervals.t similarity index 100% rename from tests/cylc-poll/14-intervals.t rename to tests/functional/cylc-poll/14-intervals.t diff --git a/tests/cylc-poll/14-intervals/reference.log b/tests/functional/cylc-poll/14-intervals/reference.log similarity index 100% rename from tests/cylc-poll/14-intervals/reference.log rename to tests/functional/cylc-poll/14-intervals/reference.log diff --git a/tests/cylc-poll/14-intervals/suite.rc b/tests/functional/cylc-poll/14-intervals/suite.rc similarity index 100% rename from tests/cylc-poll/14-intervals/suite.rc rename to tests/functional/cylc-poll/14-intervals/suite.rc diff --git a/tests/cylc-poll/15-job-st-file-no-batch.t b/tests/functional/cylc-poll/15-job-st-file-no-batch.t similarity index 100% rename from tests/cylc-poll/15-job-st-file-no-batch.t rename to tests/functional/cylc-poll/15-job-st-file-no-batch.t diff --git a/tests/cylc-poll/15-job-st-file-no-batch/reference.log b/tests/functional/cylc-poll/15-job-st-file-no-batch/reference.log similarity index 100% rename from tests/cylc-poll/15-job-st-file-no-batch/reference.log rename to tests/functional/cylc-poll/15-job-st-file-no-batch/reference.log diff --git a/tests/cylc-poll/15-job-st-file-no-batch/suite.rc b/tests/functional/cylc-poll/15-job-st-file-no-batch/suite.rc similarity index 100% rename from tests/cylc-poll/15-job-st-file-no-batch/suite.rc rename to tests/functional/cylc-poll/15-job-st-file-no-batch/suite.rc diff --git a/tests/cylc-poll/17-pbs-cant-connect.t b/tests/functional/cylc-poll/17-pbs-cant-connect.t similarity index 100% rename from tests/cylc-poll/17-pbs-cant-connect.t rename to tests/functional/cylc-poll/17-pbs-cant-connect.t diff --git a/tests/cylc-poll/17-pbs-cant-connect/lib/python/badqstat b/tests/functional/cylc-poll/17-pbs-cant-connect/lib/python/badqstat similarity index 100% rename from tests/cylc-poll/17-pbs-cant-connect/lib/python/badqstat rename to tests/functional/cylc-poll/17-pbs-cant-connect/lib/python/badqstat diff --git a/tests/cylc-poll/17-pbs-cant-connect/lib/python/my_pbs.py b/tests/functional/cylc-poll/17-pbs-cant-connect/lib/python/my_pbs.py similarity index 100% rename from tests/cylc-poll/17-pbs-cant-connect/lib/python/my_pbs.py rename to tests/functional/cylc-poll/17-pbs-cant-connect/lib/python/my_pbs.py diff --git a/tests/cylc-poll/17-pbs-cant-connect/reference.log b/tests/functional/cylc-poll/17-pbs-cant-connect/reference.log similarity index 100% rename from tests/cylc-poll/17-pbs-cant-connect/reference.log rename to tests/functional/cylc-poll/17-pbs-cant-connect/reference.log diff --git a/tests/cylc-poll/17-pbs-cant-connect/suite.rc b/tests/functional/cylc-poll/17-pbs-cant-connect/suite.rc similarity index 100% rename from tests/cylc-poll/17-pbs-cant-connect/suite.rc rename to tests/functional/cylc-poll/17-pbs-cant-connect/suite.rc diff --git a/tests/cylc-poll/test_header b/tests/functional/cylc-poll/test_header similarity index 100% rename from tests/cylc-poll/test_header rename to tests/functional/cylc-poll/test_header diff --git a/tests/cylc-remove/00-simple.t b/tests/functional/cylc-remove/00-simple.t similarity index 100% rename from tests/cylc-remove/00-simple.t rename to tests/functional/cylc-remove/00-simple.t diff --git a/tests/cylc-remove/00-simple/reference.log b/tests/functional/cylc-remove/00-simple/reference.log similarity index 100% rename from tests/cylc-remove/00-simple/reference.log rename to tests/functional/cylc-remove/00-simple/reference.log diff --git a/tests/cylc-remove/00-simple/suite.rc b/tests/functional/cylc-remove/00-simple/suite.rc similarity index 100% rename from tests/cylc-remove/00-simple/suite.rc rename to tests/functional/cylc-remove/00-simple/suite.rc diff --git a/tests/cylc-remove/01-simple-comat.t b/tests/functional/cylc-remove/01-simple-comat.t similarity index 100% rename from tests/cylc-remove/01-simple-comat.t rename to tests/functional/cylc-remove/01-simple-comat.t diff --git a/tests/cylc-remove/01-simple-comat/reference.log b/tests/functional/cylc-remove/01-simple-comat/reference.log similarity index 100% rename from tests/cylc-remove/01-simple-comat/reference.log rename to tests/functional/cylc-remove/01-simple-comat/reference.log diff --git a/tests/cylc-remove/01-simple-comat/suite.rc b/tests/functional/cylc-remove/01-simple-comat/suite.rc similarity index 100% rename from tests/cylc-remove/01-simple-comat/suite.rc rename to tests/functional/cylc-remove/01-simple-comat/suite.rc diff --git a/tests/cylc-remove/02-cycling.t b/tests/functional/cylc-remove/02-cycling.t similarity index 100% rename from tests/cylc-remove/02-cycling.t rename to tests/functional/cylc-remove/02-cycling.t diff --git a/tests/cylc-remove/02-cycling/reference.log b/tests/functional/cylc-remove/02-cycling/reference.log similarity index 100% rename from tests/cylc-remove/02-cycling/reference.log rename to tests/functional/cylc-remove/02-cycling/reference.log diff --git a/tests/cylc-remove/02-cycling/suite.rc b/tests/functional/cylc-remove/02-cycling/suite.rc similarity index 100% rename from tests/cylc-remove/02-cycling/suite.rc rename to tests/functional/cylc-remove/02-cycling/suite.rc diff --git a/tests/cylc-remove/test_header b/tests/functional/cylc-remove/test_header similarity index 100% rename from tests/cylc-remove/test_header rename to tests/functional/cylc-remove/test_header diff --git a/tests/cylc-reset/00-compat.t b/tests/functional/cylc-reset/00-compat.t similarity index 100% rename from tests/cylc-reset/00-compat.t rename to tests/functional/cylc-reset/00-compat.t diff --git a/tests/cylc-reset/00-compat/reference.log b/tests/functional/cylc-reset/00-compat/reference.log similarity index 100% rename from tests/cylc-reset/00-compat/reference.log rename to tests/functional/cylc-reset/00-compat/reference.log diff --git a/tests/cylc-reset/00-compat/suite.rc b/tests/functional/cylc-reset/00-compat/suite.rc similarity index 100% rename from tests/cylc-reset/00-compat/suite.rc rename to tests/functional/cylc-reset/00-compat/suite.rc diff --git a/tests/cylc-reset/01-filter-failed.t b/tests/functional/cylc-reset/01-filter-failed.t similarity index 100% rename from tests/cylc-reset/01-filter-failed.t rename to tests/functional/cylc-reset/01-filter-failed.t diff --git a/tests/cylc-reset/01-filter-failed/reference.log b/tests/functional/cylc-reset/01-filter-failed/reference.log similarity index 100% rename from tests/cylc-reset/01-filter-failed/reference.log rename to tests/functional/cylc-reset/01-filter-failed/reference.log diff --git a/tests/cylc-reset/01-filter-failed/suite.rc b/tests/functional/cylc-reset/01-filter-failed/suite.rc similarity index 100% rename from tests/cylc-reset/01-filter-failed/suite.rc rename to tests/functional/cylc-reset/01-filter-failed/suite.rc diff --git a/tests/cylc-reset/test_header b/tests/functional/cylc-reset/test_header similarity index 100% rename from tests/cylc-reset/test_header rename to tests/functional/cylc-reset/test_header diff --git a/tests/cylc-run/01-invalid-suite.t b/tests/functional/cylc-run/01-invalid-suite.t similarity index 100% rename from tests/cylc-run/01-invalid-suite.t rename to tests/functional/cylc-run/01-invalid-suite.t diff --git a/tests/cylc-run/02-format.t b/tests/functional/cylc-run/02-format.t similarity index 100% rename from tests/cylc-run/02-format.t rename to tests/functional/cylc-run/02-format.t diff --git a/tests/cylc-run/test_header b/tests/functional/cylc-run/test_header similarity index 100% rename from tests/cylc-run/test_header rename to tests/functional/cylc-run/test_header diff --git a/tests/cylc-scan/01-scan.t b/tests/functional/cylc-scan/01-scan.t similarity index 100% rename from tests/cylc-scan/01-scan.t rename to tests/functional/cylc-scan/01-scan.t diff --git a/tests/cylc-scan/02-sigstop.t b/tests/functional/cylc-scan/02-sigstop.t similarity index 100% rename from tests/cylc-scan/02-sigstop.t rename to tests/functional/cylc-scan/02-sigstop.t diff --git a/tests/cylc-scan/02-sigstop/suite.rc b/tests/functional/cylc-scan/02-sigstop/suite.rc similarity index 100% rename from tests/cylc-scan/02-sigstop/suite.rc rename to tests/functional/cylc-scan/02-sigstop/suite.rc diff --git a/tests/cylc-scan/04-outputs.t b/tests/functional/cylc-scan/04-outputs.t similarity index 100% rename from tests/cylc-scan/04-outputs.t rename to tests/functional/cylc-scan/04-outputs.t diff --git a/tests/cylc-scan/04-outputs/suite.rc b/tests/functional/cylc-scan/04-outputs/suite.rc similarity index 100% rename from tests/cylc-scan/04-outputs/suite.rc rename to tests/functional/cylc-scan/04-outputs/suite.rc diff --git a/tests/cylc-scan/test_header b/tests/functional/cylc-scan/test_header similarity index 100% rename from tests/cylc-scan/test_header rename to tests/functional/cylc-scan/test_header diff --git a/tests/cylc-search/00-basic.t b/tests/functional/cylc-search/00-basic.t similarity index 100% rename from tests/cylc-search/00-basic.t rename to tests/functional/cylc-search/00-basic.t diff --git a/tests/cylc-search/00-basic/bin/my-command b/tests/functional/cylc-search/00-basic/bin/my-command similarity index 100% rename from tests/cylc-search/00-basic/bin/my-command rename to tests/functional/cylc-search/00-basic/bin/my-command diff --git a/tests/cylc-search/00-basic/include/suite-runtime.rc b/tests/functional/cylc-search/00-basic/include/suite-runtime.rc similarity index 100% rename from tests/cylc-search/00-basic/include/suite-runtime.rc rename to tests/functional/cylc-search/00-basic/include/suite-runtime.rc diff --git a/tests/cylc-search/00-basic/include/suite-scheduling.rc b/tests/functional/cylc-search/00-basic/include/suite-scheduling.rc similarity index 100% rename from tests/cylc-search/00-basic/include/suite-scheduling.rc rename to tests/functional/cylc-search/00-basic/include/suite-scheduling.rc diff --git a/tests/cylc-search/00-basic/suite.rc b/tests/functional/cylc-search/00-basic/suite.rc similarity index 100% rename from tests/cylc-search/00-basic/suite.rc rename to tests/functional/cylc-search/00-basic/suite.rc diff --git a/tests/cylc-search/test_header b/tests/functional/cylc-search/test_header similarity index 100% rename from tests/cylc-search/test_header rename to tests/functional/cylc-search/test_header diff --git a/tests/cylc-show/01-clock-triggered.t b/tests/functional/cylc-show/01-clock-triggered.t similarity index 100% rename from tests/cylc-show/01-clock-triggered.t rename to tests/functional/cylc-show/01-clock-triggered.t diff --git a/tests/cylc-show/02-clock-triggered-alt-tz.t b/tests/functional/cylc-show/02-clock-triggered-alt-tz.t similarity index 100% rename from tests/cylc-show/02-clock-triggered-alt-tz.t rename to tests/functional/cylc-show/02-clock-triggered-alt-tz.t diff --git a/tests/cylc-show/03-clock-triggered-non-utc-mode.t b/tests/functional/cylc-show/03-clock-triggered-non-utc-mode.t similarity index 100% rename from tests/cylc-show/03-clock-triggered-non-utc-mode.t rename to tests/functional/cylc-show/03-clock-triggered-non-utc-mode.t diff --git a/tests/cylc-show/05-complex.t b/tests/functional/cylc-show/05-complex.t similarity index 100% rename from tests/cylc-show/05-complex.t rename to tests/functional/cylc-show/05-complex.t diff --git a/tests/cylc-show/05-complex/suite.rc b/tests/functional/cylc-show/05-complex/suite.rc similarity index 100% rename from tests/cylc-show/05-complex/suite.rc rename to tests/functional/cylc-show/05-complex/suite.rc diff --git a/tests/cylc-show/clock-triggered-alt-tz/reference.log b/tests/functional/cylc-show/clock-triggered-alt-tz/reference.log similarity index 100% rename from tests/cylc-show/clock-triggered-alt-tz/reference.log rename to tests/functional/cylc-show/clock-triggered-alt-tz/reference.log diff --git a/tests/cylc-show/clock-triggered-alt-tz/suite.rc b/tests/functional/cylc-show/clock-triggered-alt-tz/suite.rc similarity index 100% rename from tests/cylc-show/clock-triggered-alt-tz/suite.rc rename to tests/functional/cylc-show/clock-triggered-alt-tz/suite.rc diff --git a/tests/cylc-show/clock-triggered-non-utc-mode/reference-untz.log b/tests/functional/cylc-show/clock-triggered-non-utc-mode/reference-untz.log similarity index 100% rename from tests/cylc-show/clock-triggered-non-utc-mode/reference-untz.log rename to tests/functional/cylc-show/clock-triggered-non-utc-mode/reference-untz.log diff --git a/tests/cylc-show/clock-triggered-non-utc-mode/suite.rc b/tests/functional/cylc-show/clock-triggered-non-utc-mode/suite.rc similarity index 100% rename from tests/cylc-show/clock-triggered-non-utc-mode/suite.rc rename to tests/functional/cylc-show/clock-triggered-non-utc-mode/suite.rc diff --git a/tests/cylc-show/clock-triggered/reference.log b/tests/functional/cylc-show/clock-triggered/reference.log similarity index 100% rename from tests/cylc-show/clock-triggered/reference.log rename to tests/functional/cylc-show/clock-triggered/reference.log diff --git a/tests/cylc-show/clock-triggered/suite.rc b/tests/functional/cylc-show/clock-triggered/suite.rc similarity index 100% rename from tests/cylc-show/clock-triggered/suite.rc rename to tests/functional/cylc-show/clock-triggered/suite.rc diff --git a/tests/cylc-show/test_header b/tests/functional/cylc-show/test_header similarity index 100% rename from tests/cylc-show/test_header rename to tests/functional/cylc-show/test_header diff --git a/tests/cylc-submit/00-bg.t b/tests/functional/cylc-submit/00-bg.t similarity index 100% rename from tests/cylc-submit/00-bg.t rename to tests/functional/cylc-submit/00-bg.t diff --git a/tests/cylc-submit/00-bg/suite.rc b/tests/functional/cylc-submit/00-bg/suite.rc similarity index 100% rename from tests/cylc-submit/00-bg/suite.rc rename to tests/functional/cylc-submit/00-bg/suite.rc diff --git a/tests/cylc-submit/01-remote-bg b/tests/functional/cylc-submit/01-remote-bg similarity index 100% rename from tests/cylc-submit/01-remote-bg rename to tests/functional/cylc-submit/01-remote-bg diff --git a/tests/cylc-submit/01-remote-bg.t b/tests/functional/cylc-submit/01-remote-bg.t similarity index 100% rename from tests/cylc-submit/01-remote-bg.t rename to tests/functional/cylc-submit/01-remote-bg.t diff --git a/tests/cylc-submit/02-remote-with-shared-fs-bg b/tests/functional/cylc-submit/02-remote-with-shared-fs-bg similarity index 100% rename from tests/cylc-submit/02-remote-with-shared-fs-bg rename to tests/functional/cylc-submit/02-remote-with-shared-fs-bg diff --git a/tests/cylc-submit/02-remote-with-shared-fs-bg.t b/tests/functional/cylc-submit/02-remote-with-shared-fs-bg.t similarity index 100% rename from tests/cylc-submit/02-remote-with-shared-fs-bg.t rename to tests/functional/cylc-submit/02-remote-with-shared-fs-bg.t diff --git a/tests/cylc-submit/03-at b/tests/functional/cylc-submit/03-at similarity index 100% rename from tests/cylc-submit/03-at rename to tests/functional/cylc-submit/03-at diff --git a/tests/cylc-submit/03-at.t b/tests/functional/cylc-submit/03-at.t similarity index 100% rename from tests/cylc-submit/03-at.t rename to tests/functional/cylc-submit/03-at.t diff --git a/tests/cylc-submit/04-remote-at b/tests/functional/cylc-submit/04-remote-at similarity index 100% rename from tests/cylc-submit/04-remote-at rename to tests/functional/cylc-submit/04-remote-at diff --git a/tests/cylc-submit/04-remote-at.t b/tests/functional/cylc-submit/04-remote-at.t similarity index 100% rename from tests/cylc-submit/04-remote-at.t rename to tests/functional/cylc-submit/04-remote-at.t diff --git a/tests/cylc-submit/05-remote-with-shared-fs-at b/tests/functional/cylc-submit/05-remote-with-shared-fs-at similarity index 100% rename from tests/cylc-submit/05-remote-with-shared-fs-at rename to tests/functional/cylc-submit/05-remote-with-shared-fs-at diff --git a/tests/cylc-submit/05-remote-with-shared-fs-at.t b/tests/functional/cylc-submit/05-remote-with-shared-fs-at.t similarity index 100% rename from tests/cylc-submit/05-remote-with-shared-fs-at.t rename to tests/functional/cylc-submit/05-remote-with-shared-fs-at.t diff --git a/tests/cylc-submit/06-loadleveler b/tests/functional/cylc-submit/06-loadleveler similarity index 100% rename from tests/cylc-submit/06-loadleveler rename to tests/functional/cylc-submit/06-loadleveler diff --git a/tests/cylc-submit/06-loadleveler.t b/tests/functional/cylc-submit/06-loadleveler.t similarity index 100% rename from tests/cylc-submit/06-loadleveler.t rename to tests/functional/cylc-submit/06-loadleveler.t diff --git a/tests/cylc-submit/07-slurm b/tests/functional/cylc-submit/07-slurm similarity index 100% rename from tests/cylc-submit/07-slurm rename to tests/functional/cylc-submit/07-slurm diff --git a/tests/cylc-submit/07-slurm.t b/tests/functional/cylc-submit/07-slurm.t similarity index 100% rename from tests/cylc-submit/07-slurm.t rename to tests/functional/cylc-submit/07-slurm.t diff --git a/tests/cylc-submit/08-pbs b/tests/functional/cylc-submit/08-pbs similarity index 100% rename from tests/cylc-submit/08-pbs rename to tests/functional/cylc-submit/08-pbs diff --git a/tests/cylc-submit/08-pbs.t b/tests/functional/cylc-submit/08-pbs.t similarity index 100% rename from tests/cylc-submit/08-pbs.t rename to tests/functional/cylc-submit/08-pbs.t diff --git a/tests/cylc-submit/09-bad.t b/tests/functional/cylc-submit/09-bad.t similarity index 100% rename from tests/cylc-submit/09-bad.t rename to tests/functional/cylc-submit/09-bad.t diff --git a/tests/cylc-submit/09-bad/suite.rc b/tests/functional/cylc-submit/09-bad/suite.rc similarity index 100% rename from tests/cylc-submit/09-bad/suite.rc rename to tests/functional/cylc-submit/09-bad/suite.rc diff --git a/tests/cylc-submit/10-lsf b/tests/functional/cylc-submit/10-lsf similarity index 100% rename from tests/cylc-submit/10-lsf rename to tests/functional/cylc-submit/10-lsf diff --git a/tests/cylc-submit/10-lsf.t b/tests/functional/cylc-submit/10-lsf.t similarity index 100% rename from tests/cylc-submit/10-lsf.t rename to tests/functional/cylc-submit/10-lsf.t diff --git a/tests/cylc-submit/11-multi.t b/tests/functional/cylc-submit/11-multi.t similarity index 100% rename from tests/cylc-submit/11-multi.t rename to tests/functional/cylc-submit/11-multi.t diff --git a/tests/cylc-submit/test_header b/tests/functional/cylc-submit/test_header similarity index 100% rename from tests/cylc-submit/test_header rename to tests/functional/cylc-submit/test_header diff --git a/tests/cylc-subscribe/01-subscribe.t b/tests/functional/cylc-subscribe/01-subscribe.t similarity index 100% rename from tests/cylc-subscribe/01-subscribe.t rename to tests/functional/cylc-subscribe/01-subscribe.t diff --git a/tests/cylc-subscribe/test_header b/tests/functional/cylc-subscribe/test_header similarity index 100% rename from tests/cylc-subscribe/test_header rename to tests/functional/cylc-subscribe/test_header diff --git a/tests/cylc-trigger/00-compat.t b/tests/functional/cylc-trigger/00-compat.t similarity index 100% rename from tests/cylc-trigger/00-compat.t rename to tests/functional/cylc-trigger/00-compat.t diff --git a/tests/cylc-trigger/00-compat/reference.log b/tests/functional/cylc-trigger/00-compat/reference.log similarity index 100% rename from tests/cylc-trigger/00-compat/reference.log rename to tests/functional/cylc-trigger/00-compat/reference.log diff --git a/tests/cylc-trigger/00-compat/suite.rc b/tests/functional/cylc-trigger/00-compat/suite.rc similarity index 100% rename from tests/cylc-trigger/00-compat/suite.rc rename to tests/functional/cylc-trigger/00-compat/suite.rc diff --git a/tests/cylc-trigger/01-queued.t b/tests/functional/cylc-trigger/01-queued.t similarity index 100% rename from tests/cylc-trigger/01-queued.t rename to tests/functional/cylc-trigger/01-queued.t diff --git a/tests/cylc-trigger/01-queued/reference.log b/tests/functional/cylc-trigger/01-queued/reference.log similarity index 100% rename from tests/cylc-trigger/01-queued/reference.log rename to tests/functional/cylc-trigger/01-queued/reference.log diff --git a/tests/cylc-trigger/01-queued/suite.rc b/tests/functional/cylc-trigger/01-queued/suite.rc similarity index 100% rename from tests/cylc-trigger/01-queued/suite.rc rename to tests/functional/cylc-trigger/01-queued/suite.rc diff --git a/tests/cylc-trigger/02-filter-failed.t b/tests/functional/cylc-trigger/02-filter-failed.t similarity index 100% rename from tests/cylc-trigger/02-filter-failed.t rename to tests/functional/cylc-trigger/02-filter-failed.t diff --git a/tests/cylc-trigger/02-filter-failed/reference.log b/tests/functional/cylc-trigger/02-filter-failed/reference.log similarity index 100% rename from tests/cylc-trigger/02-filter-failed/reference.log rename to tests/functional/cylc-trigger/02-filter-failed/reference.log diff --git a/tests/cylc-trigger/02-filter-failed/suite.rc b/tests/functional/cylc-trigger/02-filter-failed/suite.rc similarity index 100% rename from tests/cylc-trigger/02-filter-failed/suite.rc rename to tests/functional/cylc-trigger/02-filter-failed/suite.rc diff --git a/tests/cylc-trigger/03-edit-run.t b/tests/functional/cylc-trigger/03-edit-run.t similarity index 100% rename from tests/cylc-trigger/03-edit-run.t rename to tests/functional/cylc-trigger/03-edit-run.t diff --git a/tests/cylc-trigger/03-edit-run/bin/my-edit b/tests/functional/cylc-trigger/03-edit-run/bin/my-edit similarity index 100% rename from tests/cylc-trigger/03-edit-run/bin/my-edit rename to tests/functional/cylc-trigger/03-edit-run/bin/my-edit diff --git a/tests/cylc-trigger/03-edit-run/suite.rc b/tests/functional/cylc-trigger/03-edit-run/suite.rc similarity index 100% rename from tests/cylc-trigger/03-edit-run/suite.rc rename to tests/functional/cylc-trigger/03-edit-run/suite.rc diff --git a/tests/cylc-trigger/04-filter-names.t b/tests/functional/cylc-trigger/04-filter-names.t similarity index 100% rename from tests/cylc-trigger/04-filter-names.t rename to tests/functional/cylc-trigger/04-filter-names.t diff --git a/tests/cylc-trigger/04-filter-names/reference.log b/tests/functional/cylc-trigger/04-filter-names/reference.log similarity index 100% rename from tests/cylc-trigger/04-filter-names/reference.log rename to tests/functional/cylc-trigger/04-filter-names/reference.log diff --git a/tests/cylc-trigger/04-filter-names/suite.rc b/tests/functional/cylc-trigger/04-filter-names/suite.rc similarity index 100% rename from tests/cylc-trigger/04-filter-names/suite.rc rename to tests/functional/cylc-trigger/04-filter-names/suite.rc diff --git a/tests/cylc-trigger/05-filter-cycles.t b/tests/functional/cylc-trigger/05-filter-cycles.t similarity index 100% rename from tests/cylc-trigger/05-filter-cycles.t rename to tests/functional/cylc-trigger/05-filter-cycles.t diff --git a/tests/cylc-trigger/05-filter-cycles/reference.log b/tests/functional/cylc-trigger/05-filter-cycles/reference.log similarity index 100% rename from tests/cylc-trigger/05-filter-cycles/reference.log rename to tests/functional/cylc-trigger/05-filter-cycles/reference.log diff --git a/tests/cylc-trigger/05-filter-cycles/suite.rc b/tests/functional/cylc-trigger/05-filter-cycles/suite.rc similarity index 100% rename from tests/cylc-trigger/05-filter-cycles/suite.rc rename to tests/functional/cylc-trigger/05-filter-cycles/suite.rc diff --git a/tests/cylc-trigger/06-reset-ready.t b/tests/functional/cylc-trigger/06-reset-ready.t similarity index 100% rename from tests/cylc-trigger/06-reset-ready.t rename to tests/functional/cylc-trigger/06-reset-ready.t diff --git a/tests/cylc-trigger/06-reset-ready/reference.log b/tests/functional/cylc-trigger/06-reset-ready/reference.log similarity index 100% rename from tests/cylc-trigger/06-reset-ready/reference.log rename to tests/functional/cylc-trigger/06-reset-ready/reference.log diff --git a/tests/cylc-trigger/06-reset-ready/suite.rc b/tests/functional/cylc-trigger/06-reset-ready/suite.rc similarity index 100% rename from tests/cylc-trigger/06-reset-ready/suite.rc rename to tests/functional/cylc-trigger/06-reset-ready/suite.rc diff --git a/tests/cylc-trigger/07-edit-run-abort.t b/tests/functional/cylc-trigger/07-edit-run-abort.t similarity index 100% rename from tests/cylc-trigger/07-edit-run-abort.t rename to tests/functional/cylc-trigger/07-edit-run-abort.t diff --git a/tests/cylc-trigger/07-edit-run-abort/bin/my-edit b/tests/functional/cylc-trigger/07-edit-run-abort/bin/my-edit similarity index 100% rename from tests/cylc-trigger/07-edit-run-abort/bin/my-edit rename to tests/functional/cylc-trigger/07-edit-run-abort/bin/my-edit diff --git a/tests/cylc-trigger/07-edit-run-abort/bin/my-suite-state-summary-test b/tests/functional/cylc-trigger/07-edit-run-abort/bin/my-suite-state-summary-test similarity index 100% rename from tests/cylc-trigger/07-edit-run-abort/bin/my-suite-state-summary-test rename to tests/functional/cylc-trigger/07-edit-run-abort/bin/my-suite-state-summary-test diff --git a/tests/cylc-trigger/07-edit-run-abort/suite.rc b/tests/functional/cylc-trigger/07-edit-run-abort/suite.rc similarity index 100% rename from tests/cylc-trigger/07-edit-run-abort/suite.rc rename to tests/functional/cylc-trigger/07-edit-run-abort/suite.rc diff --git a/tests/cylc-trigger/08-edit-run-host-select.t b/tests/functional/cylc-trigger/08-edit-run-host-select.t similarity index 100% rename from tests/cylc-trigger/08-edit-run-host-select.t rename to tests/functional/cylc-trigger/08-edit-run-host-select.t diff --git a/tests/cylc-trigger/08-edit-run-host-select/bin/my-edit b/tests/functional/cylc-trigger/08-edit-run-host-select/bin/my-edit similarity index 100% rename from tests/cylc-trigger/08-edit-run-host-select/bin/my-edit rename to tests/functional/cylc-trigger/08-edit-run-host-select/bin/my-edit diff --git a/tests/cylc-trigger/08-edit-run-host-select/suite.rc b/tests/functional/cylc-trigger/08-edit-run-host-select/suite.rc similarity index 100% rename from tests/cylc-trigger/08-edit-run-host-select/suite.rc rename to tests/functional/cylc-trigger/08-edit-run-host-select/suite.rc diff --git a/tests/cylc-trigger/test_header b/tests/functional/cylc-trigger/test_header similarity index 100% rename from tests/cylc-trigger/test_header rename to tests/functional/cylc-trigger/test_header diff --git a/tests/cylc-view/00-single-inc.t b/tests/functional/cylc-view/00-single-inc.t similarity index 100% rename from tests/cylc-view/00-single-inc.t rename to tests/functional/cylc-view/00-single-inc.t diff --git a/tests/cylc-view/00-single-inc/inc/default.jinja2 b/tests/functional/cylc-view/00-single-inc/inc/default.jinja2 similarity index 100% rename from tests/cylc-view/00-single-inc/inc/default.jinja2 rename to tests/functional/cylc-view/00-single-inc/inc/default.jinja2 diff --git a/tests/cylc-view/00-single-inc/suite.rc b/tests/functional/cylc-view/00-single-inc/suite.rc similarity index 100% rename from tests/cylc-view/00-single-inc/suite.rc rename to tests/functional/cylc-view/00-single-inc/suite.rc diff --git a/tests/cylc-view/test_header b/tests/functional/cylc-view/test_header similarity index 100% rename from tests/cylc-view/test_header rename to tests/functional/cylc-view/test_header diff --git a/tests/cylc.wallclock/test_header b/tests/functional/cylc.wallclock/test_header similarity index 100% rename from tests/cylc.wallclock/test_header rename to tests/functional/cylc.wallclock/test_header diff --git a/tests/database/03-remote.t b/tests/functional/database/03-remote.t similarity index 100% rename from tests/database/03-remote.t rename to tests/functional/database/03-remote.t diff --git a/tests/database/03-remote/reference.log b/tests/functional/database/03-remote/reference.log similarity index 100% rename from tests/database/03-remote/reference.log rename to tests/functional/database/03-remote/reference.log diff --git a/tests/database/03-remote/suite.rc b/tests/functional/database/03-remote/suite.rc similarity index 100% rename from tests/database/03-remote/suite.rc rename to tests/functional/database/03-remote/suite.rc diff --git a/tests/database/04-lock-recover.t b/tests/functional/database/04-lock-recover.t similarity index 100% rename from tests/database/04-lock-recover.t rename to tests/functional/database/04-lock-recover.t diff --git a/tests/database/04-lock-recover/bin/cylc-db-lock b/tests/functional/database/04-lock-recover/bin/cylc-db-lock similarity index 100% rename from tests/database/04-lock-recover/bin/cylc-db-lock rename to tests/functional/database/04-lock-recover/bin/cylc-db-lock diff --git a/tests/database/04-lock-recover/reference.log b/tests/functional/database/04-lock-recover/reference.log similarity index 100% rename from tests/database/04-lock-recover/reference.log rename to tests/functional/database/04-lock-recover/reference.log diff --git a/tests/database/04-lock-recover/suite.rc b/tests/functional/database/04-lock-recover/suite.rc similarity index 100% rename from tests/database/04-lock-recover/suite.rc rename to tests/functional/database/04-lock-recover/suite.rc diff --git a/tests/database/05-lock-recover-100.t b/tests/functional/database/05-lock-recover-100.t similarity index 100% rename from tests/database/05-lock-recover-100.t rename to tests/functional/database/05-lock-recover-100.t diff --git a/tests/database/05-lock-recover-100/bin/cylc-db-lock b/tests/functional/database/05-lock-recover-100/bin/cylc-db-lock similarity index 100% rename from tests/database/05-lock-recover-100/bin/cylc-db-lock rename to tests/functional/database/05-lock-recover-100/bin/cylc-db-lock diff --git a/tests/database/05-lock-recover-100/reference.log b/tests/functional/database/05-lock-recover-100/reference.log similarity index 100% rename from tests/database/05-lock-recover-100/reference.log rename to tests/functional/database/05-lock-recover-100/reference.log diff --git a/tests/database/05-lock-recover-100/suite.rc b/tests/functional/database/05-lock-recover-100/suite.rc similarity index 100% rename from tests/database/05-lock-recover-100/suite.rc rename to tests/functional/database/05-lock-recover-100/suite.rc diff --git a/tests/database/06-task-message.t b/tests/functional/database/06-task-message.t similarity index 100% rename from tests/database/06-task-message.t rename to tests/functional/database/06-task-message.t diff --git a/tests/database/06-task-message/reference.log b/tests/functional/database/06-task-message/reference.log similarity index 100% rename from tests/database/06-task-message/reference.log rename to tests/functional/database/06-task-message/reference.log diff --git a/tests/database/06-task-message/suite.rc b/tests/functional/database/06-task-message/suite.rc similarity index 100% rename from tests/database/06-task-message/suite.rc rename to tests/functional/database/06-task-message/suite.rc diff --git a/tests/database/test_header b/tests/functional/database/test_header similarity index 100% rename from tests/database/test_header rename to tests/functional/database/test_header diff --git a/tests/deprecations/00-pre-cylc8.t b/tests/functional/deprecations/00-pre-cylc8.t similarity index 100% rename from tests/deprecations/00-pre-cylc8.t rename to tests/functional/deprecations/00-pre-cylc8.t diff --git a/tests/deprecations/00-pre-cylc8/suite.rc b/tests/functional/deprecations/00-pre-cylc8/suite.rc similarity index 100% rename from tests/deprecations/00-pre-cylc8/suite.rc rename to tests/functional/deprecations/00-pre-cylc8/suite.rc diff --git a/tests/deprecations/01-cylc8-basic.t b/tests/functional/deprecations/01-cylc8-basic.t similarity index 100% rename from tests/deprecations/01-cylc8-basic.t rename to tests/functional/deprecations/01-cylc8-basic.t diff --git a/tests/deprecations/01-cylc8-basic/suite.rc b/tests/functional/deprecations/01-cylc8-basic/suite.rc similarity index 100% rename from tests/deprecations/01-cylc8-basic/suite.rc rename to tests/functional/deprecations/01-cylc8-basic/suite.rc diff --git a/tests/deprecations/02-overwrite.t b/tests/functional/deprecations/02-overwrite.t similarity index 100% rename from tests/deprecations/02-overwrite.t rename to tests/functional/deprecations/02-overwrite.t diff --git a/tests/deprecations/02-overwrite/suite.rc b/tests/functional/deprecations/02-overwrite/suite.rc similarity index 100% rename from tests/deprecations/02-overwrite/suite.rc rename to tests/functional/deprecations/02-overwrite/suite.rc diff --git a/tests/deprecations/test_header b/tests/functional/deprecations/test_header similarity index 100% rename from tests/deprecations/test_header rename to tests/functional/deprecations/test_header diff --git a/tests/directives/00-loadleveler.t b/tests/functional/directives/00-loadleveler.t similarity index 100% rename from tests/directives/00-loadleveler.t rename to tests/functional/directives/00-loadleveler.t diff --git a/tests/directives/01-at.t b/tests/functional/directives/01-at.t similarity index 100% rename from tests/directives/01-at.t rename to tests/functional/directives/01-at.t diff --git a/tests/directives/01-at/reference.log b/tests/functional/directives/01-at/reference.log similarity index 100% rename from tests/directives/01-at/reference.log rename to tests/functional/directives/01-at/reference.log diff --git a/tests/directives/01-at/suite.rc b/tests/functional/directives/01-at/suite.rc similarity index 100% rename from tests/directives/01-at/suite.rc rename to tests/functional/directives/01-at/suite.rc diff --git a/tests/directives/02-slurm.t b/tests/functional/directives/02-slurm.t similarity index 100% rename from tests/directives/02-slurm.t rename to tests/functional/directives/02-slurm.t diff --git a/tests/directives/03-pbs.t b/tests/functional/directives/03-pbs.t similarity index 100% rename from tests/directives/03-pbs.t rename to tests/functional/directives/03-pbs.t diff --git a/tests/directives/README b/tests/functional/directives/README similarity index 100% rename from tests/directives/README rename to tests/functional/directives/README diff --git a/tests/directives/loadleveler/reference.log b/tests/functional/directives/loadleveler/reference.log similarity index 100% rename from tests/directives/loadleveler/reference.log rename to tests/functional/directives/loadleveler/reference.log diff --git a/tests/directives/loadleveler/suite.rc b/tests/functional/directives/loadleveler/suite.rc similarity index 100% rename from tests/directives/loadleveler/suite.rc rename to tests/functional/directives/loadleveler/suite.rc diff --git a/tests/directives/pbs/reference.log b/tests/functional/directives/pbs/reference.log similarity index 100% rename from tests/directives/pbs/reference.log rename to tests/functional/directives/pbs/reference.log diff --git a/tests/directives/pbs/suite.rc b/tests/functional/directives/pbs/suite.rc similarity index 100% rename from tests/directives/pbs/suite.rc rename to tests/functional/directives/pbs/suite.rc diff --git a/tests/directives/slurm/reference.log b/tests/functional/directives/slurm/reference.log similarity index 100% rename from tests/directives/slurm/reference.log rename to tests/functional/directives/slurm/reference.log diff --git a/tests/directives/slurm/suite.rc b/tests/functional/directives/slurm/suite.rc similarity index 100% rename from tests/directives/slurm/suite.rc rename to tests/functional/directives/slurm/suite.rc diff --git a/tests/directives/test_header b/tests/functional/directives/test_header similarity index 100% rename from tests/directives/test_header rename to tests/functional/directives/test_header diff --git a/tests/empy/00-simple.t b/tests/functional/empy/00-simple.t similarity index 100% rename from tests/empy/00-simple.t rename to tests/functional/empy/00-simple.t diff --git a/tests/empy/00-simple/suite.rc b/tests/functional/empy/00-simple/suite.rc similarity index 100% rename from tests/empy/00-simple/suite.rc rename to tests/functional/empy/00-simple/suite.rc diff --git a/tests/empy/00-simple/suite.rc-expanded b/tests/functional/empy/00-simple/suite.rc-expanded similarity index 100% rename from tests/empy/00-simple/suite.rc-expanded rename to tests/functional/empy/00-simple/suite.rc-expanded diff --git a/tests/empy/test_header b/tests/functional/empy/test_header similarity index 100% rename from tests/empy/test_header rename to tests/functional/empy/test_header diff --git a/tests/env-filter/00-filter.t b/tests/functional/env-filter/00-filter.t similarity index 100% rename from tests/env-filter/00-filter.t rename to tests/functional/env-filter/00-filter.t diff --git a/tests/env-filter/test_header b/tests/functional/env-filter/test_header similarity index 100% rename from tests/env-filter/test_header rename to tests/functional/env-filter/test_header diff --git a/tests/events/00-suite.t b/tests/functional/events/00-suite.t similarity index 100% rename from tests/events/00-suite.t rename to tests/functional/events/00-suite.t diff --git a/tests/events/02-multi.t b/tests/functional/events/02-multi.t similarity index 100% rename from tests/events/02-multi.t rename to tests/functional/events/02-multi.t diff --git a/tests/events/03-timeout.t b/tests/functional/events/03-timeout.t similarity index 100% rename from tests/events/03-timeout.t rename to tests/functional/events/03-timeout.t diff --git a/tests/events/04-timeout-ref-live.t b/tests/functional/events/04-timeout-ref-live.t similarity index 100% rename from tests/events/04-timeout-ref-live.t rename to tests/functional/events/04-timeout-ref-live.t diff --git a/tests/events/06-timeout-ref-simulation.t b/tests/functional/events/06-timeout-ref-simulation.t similarity index 100% rename from tests/events/06-timeout-ref-simulation.t rename to tests/functional/events/06-timeout-ref-simulation.t diff --git a/tests/events/08-task-event-handler-retry.t b/tests/functional/events/08-task-event-handler-retry.t similarity index 100% rename from tests/events/08-task-event-handler-retry.t rename to tests/functional/events/08-task-event-handler-retry.t diff --git a/tests/events/08-task-event-handler-retry/bin/hello-event-handler b/tests/functional/events/08-task-event-handler-retry/bin/hello-event-handler similarity index 100% rename from tests/events/08-task-event-handler-retry/bin/hello-event-handler rename to tests/functional/events/08-task-event-handler-retry/bin/hello-event-handler diff --git a/tests/events/08-task-event-handler-retry/reference.log b/tests/functional/events/08-task-event-handler-retry/reference.log similarity index 100% rename from tests/events/08-task-event-handler-retry/reference.log rename to tests/functional/events/08-task-event-handler-retry/reference.log diff --git a/tests/events/08-task-event-handler-retry/suite.rc b/tests/functional/events/08-task-event-handler-retry/suite.rc similarity index 100% rename from tests/events/08-task-event-handler-retry/suite.rc rename to tests/functional/events/08-task-event-handler-retry/suite.rc diff --git a/tests/events/09-task-event-mail.t b/tests/functional/events/09-task-event-mail.t similarity index 100% rename from tests/events/09-task-event-mail.t rename to tests/functional/events/09-task-event-mail.t diff --git a/tests/events/09-task-event-mail/reference.log b/tests/functional/events/09-task-event-mail/reference.log similarity index 100% rename from tests/events/09-task-event-mail/reference.log rename to tests/functional/events/09-task-event-mail/reference.log diff --git a/tests/events/09-task-event-mail/suite.rc b/tests/functional/events/09-task-event-mail/suite.rc similarity index 100% rename from tests/events/09-task-event-mail/suite.rc rename to tests/functional/events/09-task-event-mail/suite.rc diff --git a/tests/events/10-task-event-job-logs-retrieve.t b/tests/functional/events/10-task-event-job-logs-retrieve.t similarity index 100% rename from tests/events/10-task-event-job-logs-retrieve.t rename to tests/functional/events/10-task-event-job-logs-retrieve.t diff --git a/tests/events/10-task-event-job-logs-retrieve/reference.log b/tests/functional/events/10-task-event-job-logs-retrieve/reference.log similarity index 100% rename from tests/events/10-task-event-job-logs-retrieve/reference.log rename to tests/functional/events/10-task-event-job-logs-retrieve/reference.log diff --git a/tests/events/10-task-event-job-logs-retrieve/suite.rc b/tests/functional/events/10-task-event-job-logs-retrieve/suite.rc similarity index 100% rename from tests/events/10-task-event-job-logs-retrieve/suite.rc rename to tests/functional/events/10-task-event-job-logs-retrieve/suite.rc diff --git a/tests/events/11-cycle-task-event-job-logs-retrieve.t b/tests/functional/events/11-cycle-task-event-job-logs-retrieve.t similarity index 100% rename from tests/events/11-cycle-task-event-job-logs-retrieve.t rename to tests/functional/events/11-cycle-task-event-job-logs-retrieve.t diff --git a/tests/events/11-cycle-task-event-job-logs-retrieve/reference.log b/tests/functional/events/11-cycle-task-event-job-logs-retrieve/reference.log similarity index 100% rename from tests/events/11-cycle-task-event-job-logs-retrieve/reference.log rename to tests/functional/events/11-cycle-task-event-job-logs-retrieve/reference.log diff --git a/tests/events/11-cycle-task-event-job-logs-retrieve/suite.rc b/tests/functional/events/11-cycle-task-event-job-logs-retrieve/suite.rc similarity index 100% rename from tests/events/11-cycle-task-event-job-logs-retrieve/suite.rc rename to tests/functional/events/11-cycle-task-event-job-logs-retrieve/suite.rc diff --git a/tests/events/12-task-event-handler-retry-globalcfg b/tests/functional/events/12-task-event-handler-retry-globalcfg similarity index 100% rename from tests/events/12-task-event-handler-retry-globalcfg rename to tests/functional/events/12-task-event-handler-retry-globalcfg diff --git a/tests/events/12-task-event-handler-retry-globalcfg.t b/tests/functional/events/12-task-event-handler-retry-globalcfg.t similarity index 100% rename from tests/events/12-task-event-handler-retry-globalcfg.t rename to tests/functional/events/12-task-event-handler-retry-globalcfg.t diff --git a/tests/events/13-task-event-mail-globalcfg b/tests/functional/events/13-task-event-mail-globalcfg similarity index 100% rename from tests/events/13-task-event-mail-globalcfg rename to tests/functional/events/13-task-event-mail-globalcfg diff --git a/tests/events/13-task-event-mail-globalcfg.t b/tests/functional/events/13-task-event-mail-globalcfg.t similarity index 100% rename from tests/events/13-task-event-mail-globalcfg.t rename to tests/functional/events/13-task-event-mail-globalcfg.t diff --git a/tests/events/14-task-event-job-logs-retrieve-globalcfg b/tests/functional/events/14-task-event-job-logs-retrieve-globalcfg similarity index 100% rename from tests/events/14-task-event-job-logs-retrieve-globalcfg rename to tests/functional/events/14-task-event-job-logs-retrieve-globalcfg diff --git a/tests/events/14-task-event-job-logs-retrieve-globalcfg.t b/tests/functional/events/14-task-event-job-logs-retrieve-globalcfg.t similarity index 100% rename from tests/events/14-task-event-job-logs-retrieve-globalcfg.t rename to tests/functional/events/14-task-event-job-logs-retrieve-globalcfg.t diff --git a/tests/events/15-host-task-event-handler-retry-globalcfg b/tests/functional/events/15-host-task-event-handler-retry-globalcfg similarity index 100% rename from tests/events/15-host-task-event-handler-retry-globalcfg rename to tests/functional/events/15-host-task-event-handler-retry-globalcfg diff --git a/tests/events/15-host-task-event-handler-retry-globalcfg.t b/tests/functional/events/15-host-task-event-handler-retry-globalcfg.t similarity index 100% rename from tests/events/15-host-task-event-handler-retry-globalcfg.t rename to tests/functional/events/15-host-task-event-handler-retry-globalcfg.t diff --git a/tests/events/16-task-event-job-logs-register-globalcfg/reference.log b/tests/functional/events/16-task-event-job-logs-register-globalcfg/reference.log similarity index 100% rename from tests/events/16-task-event-job-logs-register-globalcfg/reference.log rename to tests/functional/events/16-task-event-job-logs-register-globalcfg/reference.log diff --git a/tests/events/16-task-event-job-logs-register-globalcfg/suite.rc b/tests/functional/events/16-task-event-job-logs-register-globalcfg/suite.rc similarity index 100% rename from tests/events/16-task-event-job-logs-register-globalcfg/suite.rc rename to tests/functional/events/16-task-event-job-logs-register-globalcfg/suite.rc diff --git a/tests/events/17-task-event-job-logs-retrieve-command b/tests/functional/events/17-task-event-job-logs-retrieve-command similarity index 100% rename from tests/events/17-task-event-job-logs-retrieve-command rename to tests/functional/events/17-task-event-job-logs-retrieve-command diff --git a/tests/events/17-task-event-job-logs-retrieve-command.t b/tests/functional/events/17-task-event-job-logs-retrieve-command.t similarity index 100% rename from tests/events/17-task-event-job-logs-retrieve-command.t rename to tests/functional/events/17-task-event-job-logs-retrieve-command.t diff --git a/tests/events/18-suite-event-mail.t b/tests/functional/events/18-suite-event-mail.t similarity index 100% rename from tests/events/18-suite-event-mail.t rename to tests/functional/events/18-suite-event-mail.t diff --git a/tests/events/18-suite-event-mail/reference.log b/tests/functional/events/18-suite-event-mail/reference.log similarity index 100% rename from tests/events/18-suite-event-mail/reference.log rename to tests/functional/events/18-suite-event-mail/reference.log diff --git a/tests/events/18-suite-event-mail/suite.rc b/tests/functional/events/18-suite-event-mail/suite.rc similarity index 100% rename from tests/events/18-suite-event-mail/suite.rc rename to tests/functional/events/18-suite-event-mail/suite.rc diff --git a/tests/events/19-suite-event-mail-globalcfg b/tests/functional/events/19-suite-event-mail-globalcfg similarity index 100% rename from tests/events/19-suite-event-mail-globalcfg rename to tests/functional/events/19-suite-event-mail-globalcfg diff --git a/tests/events/19-suite-event-mail-globalcfg.t b/tests/functional/events/19-suite-event-mail-globalcfg.t similarity index 100% rename from tests/events/19-suite-event-mail-globalcfg.t rename to tests/functional/events/19-suite-event-mail-globalcfg.t diff --git a/tests/events/20-suite-event-handlers.t b/tests/functional/events/20-suite-event-handlers.t similarity index 100% rename from tests/events/20-suite-event-handlers.t rename to tests/functional/events/20-suite-event-handlers.t diff --git a/tests/events/20-suite-event-handlers/reference.log b/tests/functional/events/20-suite-event-handlers/reference.log similarity index 100% rename from tests/events/20-suite-event-handlers/reference.log rename to tests/functional/events/20-suite-event-handlers/reference.log diff --git a/tests/events/20-suite-event-handlers/suite.rc b/tests/functional/events/20-suite-event-handlers/suite.rc similarity index 100% rename from tests/events/20-suite-event-handlers/suite.rc rename to tests/functional/events/20-suite-event-handlers/suite.rc diff --git a/tests/events/21-suite-event-handlers-globalcfg b/tests/functional/events/21-suite-event-handlers-globalcfg similarity index 100% rename from tests/events/21-suite-event-handlers-globalcfg rename to tests/functional/events/21-suite-event-handlers-globalcfg diff --git a/tests/events/21-suite-event-handlers-globalcfg.t b/tests/functional/events/21-suite-event-handlers-globalcfg.t similarity index 100% rename from tests/events/21-suite-event-handlers-globalcfg.t rename to tests/functional/events/21-suite-event-handlers-globalcfg.t diff --git a/tests/events/23-suite-stalled-handler.t b/tests/functional/events/23-suite-stalled-handler.t similarity index 100% rename from tests/events/23-suite-stalled-handler.t rename to tests/functional/events/23-suite-stalled-handler.t diff --git a/tests/events/23-suite-stalled-handler/reference.log b/tests/functional/events/23-suite-stalled-handler/reference.log similarity index 100% rename from tests/events/23-suite-stalled-handler/reference.log rename to tests/functional/events/23-suite-stalled-handler/reference.log diff --git a/tests/events/23-suite-stalled-handler/suite.rc b/tests/functional/events/23-suite-stalled-handler/suite.rc similarity index 100% rename from tests/events/23-suite-stalled-handler/suite.rc rename to tests/functional/events/23-suite-stalled-handler/suite.rc diff --git a/tests/events/24-abort-on-stalled.t b/tests/functional/events/24-abort-on-stalled.t similarity index 100% rename from tests/events/24-abort-on-stalled.t rename to tests/functional/events/24-abort-on-stalled.t diff --git a/tests/events/24-abort-on-stalled/reference.log b/tests/functional/events/24-abort-on-stalled/reference.log similarity index 100% rename from tests/events/24-abort-on-stalled/reference.log rename to tests/functional/events/24-abort-on-stalled/reference.log diff --git a/tests/events/24-abort-on-stalled/suite.rc b/tests/functional/events/24-abort-on-stalled/suite.rc similarity index 100% rename from tests/events/24-abort-on-stalled/suite.rc rename to tests/functional/events/24-abort-on-stalled/suite.rc diff --git a/tests/events/25-held-not-stalled.t b/tests/functional/events/25-held-not-stalled.t similarity index 100% rename from tests/events/25-held-not-stalled.t rename to tests/functional/events/25-held-not-stalled.t diff --git a/tests/events/25-held-not-stalled/suite.rc b/tests/functional/events/25-held-not-stalled/suite.rc similarity index 100% rename from tests/events/25-held-not-stalled/suite.rc rename to tests/functional/events/25-held-not-stalled/suite.rc diff --git a/tests/events/26-suite-stalled-dump-prereq.t b/tests/functional/events/26-suite-stalled-dump-prereq.t similarity index 100% rename from tests/events/26-suite-stalled-dump-prereq.t rename to tests/functional/events/26-suite-stalled-dump-prereq.t diff --git a/tests/events/26-suite-stalled-dump-prereq/reference.log b/tests/functional/events/26-suite-stalled-dump-prereq/reference.log similarity index 100% rename from tests/events/26-suite-stalled-dump-prereq/reference.log rename to tests/functional/events/26-suite-stalled-dump-prereq/reference.log diff --git a/tests/events/26-suite-stalled-dump-prereq/suite.rc b/tests/functional/events/26-suite-stalled-dump-prereq/suite.rc similarity index 100% rename from tests/events/26-suite-stalled-dump-prereq/suite.rc rename to tests/functional/events/26-suite-stalled-dump-prereq/suite.rc diff --git a/tests/events/27-suite-stalled-dump-prereq-fam.t b/tests/functional/events/27-suite-stalled-dump-prereq-fam.t similarity index 100% rename from tests/events/27-suite-stalled-dump-prereq-fam.t rename to tests/functional/events/27-suite-stalled-dump-prereq-fam.t diff --git a/tests/events/27-suite-stalled-dump-prereq-fam/reference.log b/tests/functional/events/27-suite-stalled-dump-prereq-fam/reference.log similarity index 100% rename from tests/events/27-suite-stalled-dump-prereq-fam/reference.log rename to tests/functional/events/27-suite-stalled-dump-prereq-fam/reference.log diff --git a/tests/events/27-suite-stalled-dump-prereq-fam/suite.rc b/tests/functional/events/27-suite-stalled-dump-prereq-fam/suite.rc similarity index 100% rename from tests/events/27-suite-stalled-dump-prereq-fam/suite.rc rename to tests/functional/events/27-suite-stalled-dump-prereq-fam/suite.rc diff --git a/tests/events/28-inactivity.t b/tests/functional/events/28-inactivity.t similarity index 100% rename from tests/events/28-inactivity.t rename to tests/functional/events/28-inactivity.t diff --git a/tests/events/28-inactivity/suite.rc b/tests/functional/events/28-inactivity/suite.rc similarity index 100% rename from tests/events/28-inactivity/suite.rc rename to tests/functional/events/28-inactivity/suite.rc diff --git a/tests/events/29-task-event-mail-1.t b/tests/functional/events/29-task-event-mail-1.t similarity index 100% rename from tests/events/29-task-event-mail-1.t rename to tests/functional/events/29-task-event-mail-1.t diff --git a/tests/events/29-task-event-mail-1/reference.log b/tests/functional/events/29-task-event-mail-1/reference.log similarity index 100% rename from tests/events/29-task-event-mail-1/reference.log rename to tests/functional/events/29-task-event-mail-1/reference.log diff --git a/tests/events/29-task-event-mail-1/suite.rc b/tests/functional/events/29-task-event-mail-1/suite.rc similarity index 100% rename from tests/events/29-task-event-mail-1/suite.rc rename to tests/functional/events/29-task-event-mail-1/suite.rc diff --git a/tests/events/30-task-event-mail-2.t b/tests/functional/events/30-task-event-mail-2.t similarity index 100% rename from tests/events/30-task-event-mail-2.t rename to tests/functional/events/30-task-event-mail-2.t diff --git a/tests/events/30-task-event-mail-2/reference.log b/tests/functional/events/30-task-event-mail-2/reference.log similarity index 100% rename from tests/events/30-task-event-mail-2/reference.log rename to tests/functional/events/30-task-event-mail-2/reference.log diff --git a/tests/events/30-task-event-mail-2/suite.rc b/tests/functional/events/30-task-event-mail-2/suite.rc similarity index 100% rename from tests/events/30-task-event-mail-2/suite.rc rename to tests/functional/events/30-task-event-mail-2/suite.rc diff --git a/tests/events/32-task-event-job-logs-retrieve-2.t b/tests/functional/events/32-task-event-job-logs-retrieve-2.t similarity index 100% rename from tests/events/32-task-event-job-logs-retrieve-2.t rename to tests/functional/events/32-task-event-job-logs-retrieve-2.t diff --git a/tests/events/32-task-event-job-logs-retrieve-2/reference.log b/tests/functional/events/32-task-event-job-logs-retrieve-2/reference.log similarity index 100% rename from tests/events/32-task-event-job-logs-retrieve-2/reference.log rename to tests/functional/events/32-task-event-job-logs-retrieve-2/reference.log diff --git a/tests/events/32-task-event-job-logs-retrieve-2/suite.rc b/tests/functional/events/32-task-event-job-logs-retrieve-2/suite.rc similarity index 100% rename from tests/events/32-task-event-job-logs-retrieve-2/suite.rc rename to tests/functional/events/32-task-event-job-logs-retrieve-2/suite.rc diff --git a/tests/events/33-task-event-job-logs-retrieve-3.t b/tests/functional/events/33-task-event-job-logs-retrieve-3.t similarity index 100% rename from tests/events/33-task-event-job-logs-retrieve-3.t rename to tests/functional/events/33-task-event-job-logs-retrieve-3.t diff --git a/tests/events/33-task-event-job-logs-retrieve-3/reference.log b/tests/functional/events/33-task-event-job-logs-retrieve-3/reference.log similarity index 100% rename from tests/events/33-task-event-job-logs-retrieve-3/reference.log rename to tests/functional/events/33-task-event-job-logs-retrieve-3/reference.log diff --git a/tests/events/33-task-event-job-logs-retrieve-3/suite.rc b/tests/functional/events/33-task-event-job-logs-retrieve-3/suite.rc similarity index 100% rename from tests/events/33-task-event-job-logs-retrieve-3/suite.rc rename to tests/functional/events/33-task-event-job-logs-retrieve-3/suite.rc diff --git a/tests/events/34-task-abort.t b/tests/functional/events/34-task-abort.t similarity index 100% rename from tests/events/34-task-abort.t rename to tests/functional/events/34-task-abort.t diff --git a/tests/events/34-task-abort/reference.log b/tests/functional/events/34-task-abort/reference.log similarity index 100% rename from tests/events/34-task-abort/reference.log rename to tests/functional/events/34-task-abort/reference.log diff --git a/tests/events/34-task-abort/suite.rc b/tests/functional/events/34-task-abort/suite.rc similarity index 100% rename from tests/events/34-task-abort/suite.rc rename to tests/functional/events/34-task-abort/suite.rc diff --git a/tests/events/35-task-event-handler-importance.t b/tests/functional/events/35-task-event-handler-importance.t similarity index 100% rename from tests/events/35-task-event-handler-importance.t rename to tests/functional/events/35-task-event-handler-importance.t diff --git a/tests/events/35-task-event-handler-importance/suite.rc b/tests/functional/events/35-task-event-handler-importance/suite.rc similarity index 100% rename from tests/events/35-task-event-handler-importance/suite.rc rename to tests/functional/events/35-task-event-handler-importance/suite.rc diff --git a/tests/events/36-task-event-bad-custom-template.t b/tests/functional/events/36-task-event-bad-custom-template.t similarity index 100% rename from tests/events/36-task-event-bad-custom-template.t rename to tests/functional/events/36-task-event-bad-custom-template.t diff --git a/tests/events/36-task-event-bad-custom-template/reference.log b/tests/functional/events/36-task-event-bad-custom-template/reference.log similarity index 100% rename from tests/events/36-task-event-bad-custom-template/reference.log rename to tests/functional/events/36-task-event-bad-custom-template/reference.log diff --git a/tests/events/36-task-event-bad-custom-template/suite.rc b/tests/functional/events/36-task-event-bad-custom-template/suite.rc similarity index 100% rename from tests/events/36-task-event-bad-custom-template/suite.rc rename to tests/functional/events/36-task-event-bad-custom-template/suite.rc diff --git a/tests/events/37-suite-event-bad-custom-template.t b/tests/functional/events/37-suite-event-bad-custom-template.t similarity index 100% rename from tests/events/37-suite-event-bad-custom-template.t rename to tests/functional/events/37-suite-event-bad-custom-template.t diff --git a/tests/events/37-suite-event-bad-custom-template/reference.log b/tests/functional/events/37-suite-event-bad-custom-template/reference.log similarity index 100% rename from tests/events/37-suite-event-bad-custom-template/reference.log rename to tests/functional/events/37-suite-event-bad-custom-template/reference.log diff --git a/tests/events/37-suite-event-bad-custom-template/suite.rc b/tests/functional/events/37-suite-event-bad-custom-template/suite.rc similarity index 100% rename from tests/events/37-suite-event-bad-custom-template/suite.rc rename to tests/functional/events/37-suite-event-bad-custom-template/suite.rc diff --git a/tests/events/38-task-event-handler-custom.t b/tests/functional/events/38-task-event-handler-custom.t similarity index 100% rename from tests/events/38-task-event-handler-custom.t rename to tests/functional/events/38-task-event-handler-custom.t diff --git a/tests/events/38-task-event-handler-custom/reference.log b/tests/functional/events/38-task-event-handler-custom/reference.log similarity index 100% rename from tests/events/38-task-event-handler-custom/reference.log rename to tests/functional/events/38-task-event-handler-custom/reference.log diff --git a/tests/events/38-task-event-handler-custom/suite.rc b/tests/functional/events/38-task-event-handler-custom/suite.rc similarity index 100% rename from tests/events/38-task-event-handler-custom/suite.rc rename to tests/functional/events/38-task-event-handler-custom/suite.rc diff --git a/tests/events/41-late.t b/tests/functional/events/41-late.t similarity index 100% rename from tests/events/41-late.t rename to tests/functional/events/41-late.t diff --git a/tests/events/41-late/bin/my-handler b/tests/functional/events/41-late/bin/my-handler similarity index 100% rename from tests/events/41-late/bin/my-handler rename to tests/functional/events/41-late/bin/my-handler diff --git a/tests/events/41-late/suite.rc b/tests/functional/events/41-late/suite.rc similarity index 100% rename from tests/events/41-late/suite.rc rename to tests/functional/events/41-late/suite.rc diff --git a/tests/events/42-late-then-restart.t b/tests/functional/events/42-late-then-restart.t similarity index 100% rename from tests/events/42-late-then-restart.t rename to tests/functional/events/42-late-then-restart.t diff --git a/tests/events/42-late-then-restart/bin/my-handler b/tests/functional/events/42-late-then-restart/bin/my-handler similarity index 100% rename from tests/events/42-late-then-restart/bin/my-handler rename to tests/functional/events/42-late-then-restart/bin/my-handler diff --git a/tests/events/42-late-then-restart/suite.rc b/tests/functional/events/42-late-then-restart/suite.rc similarity index 100% rename from tests/events/42-late-then-restart/suite.rc rename to tests/functional/events/42-late-then-restart/suite.rc diff --git a/tests/events/43-late-spawn.t b/tests/functional/events/43-late-spawn.t similarity index 100% rename from tests/events/43-late-spawn.t rename to tests/functional/events/43-late-spawn.t diff --git a/tests/events/43-late-spawn/suite.rc b/tests/functional/events/43-late-spawn/suite.rc similarity index 100% rename from tests/events/43-late-spawn/suite.rc rename to tests/functional/events/43-late-spawn/suite.rc diff --git a/tests/events/45-task-event-handler-multi-warning.t b/tests/functional/events/45-task-event-handler-multi-warning.t similarity index 100% rename from tests/events/45-task-event-handler-multi-warning.t rename to tests/functional/events/45-task-event-handler-multi-warning.t diff --git a/tests/events/46-task-output-as-event.t b/tests/functional/events/46-task-output-as-event.t similarity index 100% rename from tests/events/46-task-output-as-event.t rename to tests/functional/events/46-task-output-as-event.t diff --git a/tests/events/47-long-output.t b/tests/functional/events/47-long-output.t similarity index 100% rename from tests/events/47-long-output.t rename to tests/functional/events/47-long-output.t diff --git a/tests/events/48-suite-aborted.t b/tests/functional/events/48-suite-aborted.t similarity index 100% rename from tests/events/48-suite-aborted.t rename to tests/functional/events/48-suite-aborted.t diff --git a/tests/events/48-suite-aborted/reference.log b/tests/functional/events/48-suite-aborted/reference.log similarity index 100% rename from tests/events/48-suite-aborted/reference.log rename to tests/functional/events/48-suite-aborted/reference.log diff --git a/tests/events/48-suite-aborted/suite.rc b/tests/functional/events/48-suite-aborted/suite.rc similarity index 100% rename from tests/events/48-suite-aborted/suite.rc rename to tests/functional/events/48-suite-aborted/suite.rc diff --git a/tests/events/49-task-event-host-select-fail.t b/tests/functional/events/49-task-event-host-select-fail.t similarity index 100% rename from tests/events/49-task-event-host-select-fail.t rename to tests/functional/events/49-task-event-host-select-fail.t diff --git a/tests/events/50-ref-test-fail/reference.log b/tests/functional/events/50-ref-test-fail/reference.log similarity index 100% rename from tests/events/50-ref-test-fail/reference.log rename to tests/functional/events/50-ref-test-fail/reference.log diff --git a/tests/events/50-ref-test-fail/suite.rc b/tests/functional/events/50-ref-test-fail/suite.rc similarity index 100% rename from tests/events/50-ref-test-fail/suite.rc rename to tests/functional/events/50-ref-test-fail/suite.rc diff --git a/tests/events/suite/hidden/shutdown/suite.rc b/tests/functional/events/suite/hidden/shutdown/suite.rc similarity index 100% rename from tests/events/suite/hidden/shutdown/suite.rc rename to tests/functional/events/suite/hidden/shutdown/suite.rc diff --git a/tests/events/suite/hidden/startup/suite.rc b/tests/functional/events/suite/hidden/startup/suite.rc similarity index 100% rename from tests/events/suite/hidden/startup/suite.rc rename to tests/functional/events/suite/hidden/startup/suite.rc diff --git a/tests/events/suite/hidden/timeout/suite.rc b/tests/functional/events/suite/hidden/timeout/suite.rc similarity index 100% rename from tests/events/suite/hidden/timeout/suite.rc rename to tests/functional/events/suite/hidden/timeout/suite.rc diff --git a/tests/events/suite/reference.log b/tests/functional/events/suite/reference.log similarity index 100% rename from tests/events/suite/reference.log rename to tests/functional/events/suite/reference.log diff --git a/tests/events/suite/suite.rc b/tests/functional/events/suite/suite.rc similarity index 100% rename from tests/events/suite/suite.rc rename to tests/functional/events/suite/suite.rc diff --git a/tests/events/test_header b/tests/functional/events/test_header similarity index 100% rename from tests/events/test_header rename to tests/functional/events/test_header diff --git a/tests/events/timeout-ref/reference.log b/tests/functional/events/timeout-ref/reference.log similarity index 100% rename from tests/events/timeout-ref/reference.log rename to tests/functional/events/timeout-ref/reference.log diff --git a/tests/events/timeout-ref/suite.rc b/tests/functional/events/timeout-ref/suite.rc similarity index 100% rename from tests/events/timeout-ref/suite.rc rename to tests/functional/events/timeout-ref/suite.rc diff --git a/tests/events/timeout/suite.rc b/tests/functional/events/timeout/suite.rc similarity index 100% rename from tests/events/timeout/suite.rc rename to tests/functional/events/timeout/suite.rc diff --git a/tests/execution-time-limit/02-slurm.t b/tests/functional/execution-time-limit/02-slurm.t similarity index 100% rename from tests/execution-time-limit/02-slurm.t rename to tests/functional/execution-time-limit/02-slurm.t diff --git a/tests/execution-time-limit/02-slurm/reference.log b/tests/functional/execution-time-limit/02-slurm/reference.log similarity index 100% rename from tests/execution-time-limit/02-slurm/reference.log rename to tests/functional/execution-time-limit/02-slurm/reference.log diff --git a/tests/execution-time-limit/02-slurm/suite.rc b/tests/functional/execution-time-limit/02-slurm/suite.rc similarity index 100% rename from tests/execution-time-limit/02-slurm/suite.rc rename to tests/functional/execution-time-limit/02-slurm/suite.rc diff --git a/tests/execution-time-limit/03-pbs b/tests/functional/execution-time-limit/03-pbs similarity index 100% rename from tests/execution-time-limit/03-pbs rename to tests/functional/execution-time-limit/03-pbs diff --git a/tests/execution-time-limit/03-pbs.t b/tests/functional/execution-time-limit/03-pbs.t similarity index 100% rename from tests/execution-time-limit/03-pbs.t rename to tests/functional/execution-time-limit/03-pbs.t diff --git a/tests/execution-time-limit/test_header b/tests/functional/execution-time-limit/test_header similarity index 100% rename from tests/execution-time-limit/test_header rename to tests/functional/execution-time-limit/test_header diff --git a/tests/ext-trigger/00-satellite.t b/tests/functional/ext-trigger/00-satellite.t similarity index 100% rename from tests/ext-trigger/00-satellite.t rename to tests/functional/ext-trigger/00-satellite.t diff --git a/tests/ext-trigger/00-satellite/reference.log b/tests/functional/ext-trigger/00-satellite/reference.log similarity index 100% rename from tests/ext-trigger/00-satellite/reference.log rename to tests/functional/ext-trigger/00-satellite/reference.log diff --git a/tests/ext-trigger/00-satellite/suite.rc b/tests/functional/ext-trigger/00-satellite/suite.rc similarity index 100% rename from tests/ext-trigger/00-satellite/suite.rc rename to tests/functional/ext-trigger/00-satellite/suite.rc diff --git a/tests/ext-trigger/01-no-nudge.t b/tests/functional/ext-trigger/01-no-nudge.t similarity index 100% rename from tests/ext-trigger/01-no-nudge.t rename to tests/functional/ext-trigger/01-no-nudge.t diff --git a/tests/ext-trigger/01-no-nudge/suite.rc b/tests/functional/ext-trigger/01-no-nudge/suite.rc similarity index 100% rename from tests/ext-trigger/01-no-nudge/suite.rc rename to tests/functional/ext-trigger/01-no-nudge/suite.rc diff --git a/tests/ext-trigger/02-cycle-point.t b/tests/functional/ext-trigger/02-cycle-point.t similarity index 100% rename from tests/ext-trigger/02-cycle-point.t rename to tests/functional/ext-trigger/02-cycle-point.t diff --git a/tests/ext-trigger/02-cycle-point/suite.rc b/tests/functional/ext-trigger/02-cycle-point/suite.rc similarity index 100% rename from tests/ext-trigger/02-cycle-point/suite.rc rename to tests/functional/ext-trigger/02-cycle-point/suite.rc diff --git a/tests/ext-trigger/test_header b/tests/functional/ext-trigger/test_header similarity index 100% rename from tests/ext-trigger/test_header rename to tests/functional/ext-trigger/test_header diff --git a/tests/graph-equivalence/00-oneline.t b/tests/functional/graph-equivalence/00-oneline.t similarity index 100% rename from tests/graph-equivalence/00-oneline.t rename to tests/functional/graph-equivalence/00-oneline.t diff --git a/tests/graph-equivalence/01-twolines.t b/tests/functional/graph-equivalence/01-twolines.t similarity index 100% rename from tests/graph-equivalence/01-twolines.t rename to tests/functional/graph-equivalence/01-twolines.t diff --git a/tests/graph-equivalence/02-splitline.t b/tests/functional/graph-equivalence/02-splitline.t similarity index 100% rename from tests/graph-equivalence/02-splitline.t rename to tests/functional/graph-equivalence/02-splitline.t diff --git a/tests/graph-equivalence/03-multiline_and1.t b/tests/functional/graph-equivalence/03-multiline_and1.t similarity index 100% rename from tests/graph-equivalence/03-multiline_and1.t rename to tests/functional/graph-equivalence/03-multiline_and1.t diff --git a/tests/graph-equivalence/04-multiline_and2.t b/tests/functional/graph-equivalence/04-multiline_and2.t similarity index 100% rename from tests/graph-equivalence/04-multiline_and2.t rename to tests/functional/graph-equivalence/04-multiline_and2.t diff --git a/tests/graph-equivalence/multiline_and1/reference.log b/tests/functional/graph-equivalence/multiline_and1/reference.log similarity index 100% rename from tests/graph-equivalence/multiline_and1/reference.log rename to tests/functional/graph-equivalence/multiline_and1/reference.log diff --git a/tests/graph-equivalence/multiline_and1/suite.rc b/tests/functional/graph-equivalence/multiline_and1/suite.rc similarity index 100% rename from tests/graph-equivalence/multiline_and1/suite.rc rename to tests/functional/graph-equivalence/multiline_and1/suite.rc diff --git a/tests/graph-equivalence/multiline_and2/reference.log b/tests/functional/graph-equivalence/multiline_and2/reference.log similarity index 100% rename from tests/graph-equivalence/multiline_and2/reference.log rename to tests/functional/graph-equivalence/multiline_and2/reference.log diff --git a/tests/graph-equivalence/multiline_and2/suite.rc b/tests/functional/graph-equivalence/multiline_and2/suite.rc similarity index 100% rename from tests/graph-equivalence/multiline_and2/suite.rc rename to tests/functional/graph-equivalence/multiline_and2/suite.rc diff --git a/tests/graph-equivalence/multiline_and_refs/c-ref b/tests/functional/graph-equivalence/multiline_and_refs/c-ref similarity index 100% rename from tests/graph-equivalence/multiline_and_refs/c-ref rename to tests/functional/graph-equivalence/multiline_and_refs/c-ref diff --git a/tests/graph-equivalence/multiline_and_refs/c-ref-2 b/tests/functional/graph-equivalence/multiline_and_refs/c-ref-2 similarity index 100% rename from tests/graph-equivalence/multiline_and_refs/c-ref-2 rename to tests/functional/graph-equivalence/multiline_and_refs/c-ref-2 diff --git a/tests/graph-equivalence/splitline_refs/a-ref b/tests/functional/graph-equivalence/splitline_refs/a-ref similarity index 100% rename from tests/graph-equivalence/splitline_refs/a-ref rename to tests/functional/graph-equivalence/splitline_refs/a-ref diff --git a/tests/graph-equivalence/splitline_refs/b-ref b/tests/functional/graph-equivalence/splitline_refs/b-ref similarity index 100% rename from tests/graph-equivalence/splitline_refs/b-ref rename to tests/functional/graph-equivalence/splitline_refs/b-ref diff --git a/tests/graph-equivalence/splitline_refs/c-ref b/tests/functional/graph-equivalence/splitline_refs/c-ref similarity index 100% rename from tests/graph-equivalence/splitline_refs/c-ref rename to tests/functional/graph-equivalence/splitline_refs/c-ref diff --git a/tests/graph-equivalence/test1/reference.log b/tests/functional/graph-equivalence/test1/reference.log similarity index 100% rename from tests/graph-equivalence/test1/reference.log rename to tests/functional/graph-equivalence/test1/reference.log diff --git a/tests/graph-equivalence/test1/suite.rc b/tests/functional/graph-equivalence/test1/suite.rc similarity index 100% rename from tests/graph-equivalence/test1/suite.rc rename to tests/functional/graph-equivalence/test1/suite.rc diff --git a/tests/graph-equivalence/test2/reference.log b/tests/functional/graph-equivalence/test2/reference.log similarity index 100% rename from tests/graph-equivalence/test2/reference.log rename to tests/functional/graph-equivalence/test2/reference.log diff --git a/tests/graph-equivalence/test2/suite.rc b/tests/functional/graph-equivalence/test2/suite.rc similarity index 100% rename from tests/graph-equivalence/test2/suite.rc rename to tests/functional/graph-equivalence/test2/suite.rc diff --git a/tests/graph-equivalence/test3/reference.log b/tests/functional/graph-equivalence/test3/reference.log similarity index 100% rename from tests/graph-equivalence/test3/reference.log rename to tests/functional/graph-equivalence/test3/reference.log diff --git a/tests/graph-equivalence/test3/suite.rc b/tests/functional/graph-equivalence/test3/suite.rc similarity index 100% rename from tests/graph-equivalence/test3/suite.rc rename to tests/functional/graph-equivalence/test3/suite.rc diff --git a/tests/graph-equivalence/test_header b/tests/functional/graph-equivalence/test_header similarity index 100% rename from tests/graph-equivalence/test_header rename to tests/functional/graph-equivalence/test_header diff --git a/tests/graphing/00-boundaries.t b/tests/functional/graphing/00-boundaries.t similarity index 100% rename from tests/graphing/00-boundaries.t rename to tests/functional/graphing/00-boundaries.t diff --git a/tests/graphing/00-boundaries/20140808T00.graph.plain.ref b/tests/functional/graphing/00-boundaries/20140808T00.graph.plain.ref similarity index 100% rename from tests/graphing/00-boundaries/20140808T00.graph.plain.ref rename to tests/functional/graphing/00-boundaries/20140808T00.graph.plain.ref diff --git a/tests/graphing/00-boundaries/20140808T06.graph.plain.ref b/tests/functional/graphing/00-boundaries/20140808T06.graph.plain.ref similarity index 100% rename from tests/graphing/00-boundaries/20140808T06.graph.plain.ref rename to tests/functional/graphing/00-boundaries/20140808T06.graph.plain.ref diff --git a/tests/graphing/00-boundaries/suite.rc b/tests/functional/graphing/00-boundaries/suite.rc similarity index 100% rename from tests/graphing/00-boundaries/suite.rc rename to tests/functional/graphing/00-boundaries/suite.rc diff --git a/tests/graphing/01-namespace.t b/tests/functional/graphing/01-namespace.t similarity index 100% rename from tests/graphing/01-namespace.t rename to tests/functional/graphing/01-namespace.t diff --git a/tests/graphing/01-namespace/graph.plain.ref b/tests/functional/graphing/01-namespace/graph.plain.ref similarity index 100% rename from tests/graphing/01-namespace/graph.plain.ref rename to tests/functional/graphing/01-namespace/graph.plain.ref diff --git a/tests/graphing/01-namespace/suite.rc b/tests/functional/graphing/01-namespace/suite.rc similarity index 100% rename from tests/graphing/01-namespace/suite.rc rename to tests/functional/graphing/01-namespace/suite.rc diff --git a/tests/graphing/02-icp-task-missing.t b/tests/functional/graphing/02-icp-task-missing.t similarity index 100% rename from tests/graphing/02-icp-task-missing.t rename to tests/functional/graphing/02-icp-task-missing.t diff --git a/tests/graphing/02-icp-task-missing/graph.plain.ref b/tests/functional/graphing/02-icp-task-missing/graph.plain.ref similarity index 100% rename from tests/graphing/02-icp-task-missing/graph.plain.ref rename to tests/functional/graphing/02-icp-task-missing/graph.plain.ref diff --git a/tests/graphing/02-icp-task-missing/suite.rc b/tests/functional/graphing/02-icp-task-missing/suite.rc similarity index 100% rename from tests/graphing/02-icp-task-missing/suite.rc rename to tests/functional/graphing/02-icp-task-missing/suite.rc diff --git a/tests/graphing/03-filter/graph.plain.ref.filtered b/tests/functional/graphing/03-filter/graph.plain.ref.filtered similarity index 100% rename from tests/graphing/03-filter/graph.plain.ref.filtered rename to tests/functional/graphing/03-filter/graph.plain.ref.filtered diff --git a/tests/graphing/03-filter/graph.plain.ref.orig b/tests/functional/graphing/03-filter/graph.plain.ref.orig similarity index 100% rename from tests/graphing/03-filter/graph.plain.ref.orig rename to tests/functional/graphing/03-filter/graph.plain.ref.orig diff --git a/tests/graphing/03-filter/suite.rc b/tests/functional/graphing/03-filter/suite.rc similarity index 100% rename from tests/graphing/03-filter/suite.rc rename to tests/functional/graphing/03-filter/suite.rc diff --git a/tests/graphing/04-filter-siblings/graph.plain.ref.filtered b/tests/functional/graphing/04-filter-siblings/graph.plain.ref.filtered similarity index 100% rename from tests/graphing/04-filter-siblings/graph.plain.ref.filtered rename to tests/functional/graphing/04-filter-siblings/graph.plain.ref.filtered diff --git a/tests/graphing/04-filter-siblings/graph.plain.ref.orig b/tests/functional/graphing/04-filter-siblings/graph.plain.ref.orig similarity index 100% rename from tests/graphing/04-filter-siblings/graph.plain.ref.orig rename to tests/functional/graphing/04-filter-siblings/graph.plain.ref.orig diff --git a/tests/graphing/04-filter-siblings/suite.rc b/tests/functional/graphing/04-filter-siblings/suite.rc similarity index 100% rename from tests/graphing/04-filter-siblings/suite.rc rename to tests/functional/graphing/04-filter-siblings/suite.rc diff --git a/tests/graphing/05-suicide-family.t b/tests/functional/graphing/05-suicide-family.t similarity index 100% rename from tests/graphing/05-suicide-family.t rename to tests/functional/graphing/05-suicide-family.t diff --git a/tests/graphing/05-suicide-family/graph.plain.ref b/tests/functional/graphing/05-suicide-family/graph.plain.ref similarity index 100% rename from tests/graphing/05-suicide-family/graph.plain.ref rename to tests/functional/graphing/05-suicide-family/graph.plain.ref diff --git a/tests/graphing/05-suicide-family/graph.plain.suicide.ref b/tests/functional/graphing/05-suicide-family/graph.plain.suicide.ref similarity index 100% rename from tests/graphing/05-suicide-family/graph.plain.suicide.ref rename to tests/functional/graphing/05-suicide-family/graph.plain.suicide.ref diff --git a/tests/graphing/05-suicide-family/suite.rc b/tests/functional/graphing/05-suicide-family/suite.rc similarity index 100% rename from tests/graphing/05-suicide-family/suite.rc rename to tests/functional/graphing/05-suicide-family/suite.rc diff --git a/tests/graphing/06-family-or.t b/tests/functional/graphing/06-family-or.t similarity index 100% rename from tests/graphing/06-family-or.t rename to tests/functional/graphing/06-family-or.t diff --git a/tests/graphing/07-stop-at-final-point.t b/tests/functional/graphing/07-stop-at-final-point.t similarity index 100% rename from tests/graphing/07-stop-at-final-point.t rename to tests/functional/graphing/07-stop-at-final-point.t diff --git a/tests/graphing/07-stop-at-final-point/graph.plain.ref b/tests/functional/graphing/07-stop-at-final-point/graph.plain.ref similarity index 100% rename from tests/graphing/07-stop-at-final-point/graph.plain.ref rename to tests/functional/graphing/07-stop-at-final-point/graph.plain.ref diff --git a/tests/graphing/07-stop-at-final-point/suite.rc b/tests/functional/graphing/07-stop-at-final-point/suite.rc similarity index 100% rename from tests/graphing/07-stop-at-final-point/suite.rc rename to tests/functional/graphing/07-stop-at-final-point/suite.rc diff --git a/tests/graphing/08-ungrouped.t b/tests/functional/graphing/08-ungrouped.t similarity index 100% rename from tests/graphing/08-ungrouped.t rename to tests/functional/graphing/08-ungrouped.t diff --git a/tests/graphing/08-ungrouped/graph.plain.ref b/tests/functional/graphing/08-ungrouped/graph.plain.ref similarity index 100% rename from tests/graphing/08-ungrouped/graph.plain.ref rename to tests/functional/graphing/08-ungrouped/graph.plain.ref diff --git a/tests/graphing/08-ungrouped/graph.plain.ungrouped.ref b/tests/functional/graphing/08-ungrouped/graph.plain.ungrouped.ref similarity index 100% rename from tests/graphing/08-ungrouped/graph.plain.ungrouped.ref rename to tests/functional/graphing/08-ungrouped/graph.plain.ungrouped.ref diff --git a/tests/graphing/08-ungrouped/suite.rc b/tests/functional/graphing/08-ungrouped/suite.rc similarity index 100% rename from tests/graphing/08-ungrouped/suite.rc rename to tests/functional/graphing/08-ungrouped/suite.rc diff --git a/tests/graphing/09-close-fam.t b/tests/functional/graphing/09-close-fam.t similarity index 100% rename from tests/graphing/09-close-fam.t rename to tests/functional/graphing/09-close-fam.t diff --git a/tests/graphing/09-close-fam/graph.plain.ref b/tests/functional/graphing/09-close-fam/graph.plain.ref similarity index 100% rename from tests/graphing/09-close-fam/graph.plain.ref rename to tests/functional/graphing/09-close-fam/graph.plain.ref diff --git a/tests/graphing/09-close-fam/graph.plain.ungrouped.ref b/tests/functional/graphing/09-close-fam/graph.plain.ungrouped.ref similarity index 100% rename from tests/graphing/09-close-fam/graph.plain.ungrouped.ref rename to tests/functional/graphing/09-close-fam/graph.plain.ungrouped.ref diff --git a/tests/graphing/09-close-fam/suite.rc b/tests/functional/graphing/09-close-fam/suite.rc similarity index 100% rename from tests/graphing/09-close-fam/suite.rc rename to tests/functional/graphing/09-close-fam/suite.rc diff --git a/tests/graphing/09-ref-graph.t b/tests/functional/graphing/09-ref-graph.t similarity index 100% rename from tests/graphing/09-ref-graph.t rename to tests/functional/graphing/09-ref-graph.t diff --git a/tests/graphing/09-ref-graph/graph.ref b/tests/functional/graphing/09-ref-graph/graph.ref similarity index 100% rename from tests/graphing/09-ref-graph/graph.ref rename to tests/functional/graphing/09-ref-graph/graph.ref diff --git a/tests/graphing/09-ref-graph/suite.rc b/tests/functional/graphing/09-ref-graph/suite.rc similarity index 100% rename from tests/graphing/09-ref-graph/suite.rc rename to tests/functional/graphing/09-ref-graph/suite.rc diff --git a/tests/graphing/10-ghost-nodes.t b/tests/functional/graphing/10-ghost-nodes.t similarity index 100% rename from tests/graphing/10-ghost-nodes.t rename to tests/functional/graphing/10-ghost-nodes.t diff --git a/tests/graphing/10-ghost-nodes/graph.plain.ref b/tests/functional/graphing/10-ghost-nodes/graph.plain.ref similarity index 100% rename from tests/graphing/10-ghost-nodes/graph.plain.ref rename to tests/functional/graphing/10-ghost-nodes/graph.plain.ref diff --git a/tests/graphing/10-ghost-nodes/suite.rc b/tests/functional/graphing/10-ghost-nodes/suite.rc similarity index 100% rename from tests/graphing/10-ghost-nodes/suite.rc rename to tests/functional/graphing/10-ghost-nodes/suite.rc diff --git a/tests/graphing/11-nested-fam.t b/tests/functional/graphing/11-nested-fam.t similarity index 100% rename from tests/graphing/11-nested-fam.t rename to tests/functional/graphing/11-nested-fam.t diff --git a/tests/graphing/11-nested-fam/graph.plain.ref b/tests/functional/graphing/11-nested-fam/graph.plain.ref similarity index 100% rename from tests/graphing/11-nested-fam/graph.plain.ref rename to tests/functional/graphing/11-nested-fam/graph.plain.ref diff --git a/tests/graphing/11-nested-fam/graph.plain.ungrouped.ref b/tests/functional/graphing/11-nested-fam/graph.plain.ungrouped.ref similarity index 100% rename from tests/graphing/11-nested-fam/graph.plain.ungrouped.ref rename to tests/functional/graphing/11-nested-fam/graph.plain.ungrouped.ref diff --git a/tests/graphing/11-nested-fam/suite.rc b/tests/functional/graphing/11-nested-fam/suite.rc similarity index 100% rename from tests/graphing/11-nested-fam/suite.rc rename to tests/functional/graphing/11-nested-fam/suite.rc diff --git a/tests/graphing/test_header b/tests/functional/graphing/test_header similarity index 100% rename from tests/graphing/test_header rename to tests/functional/graphing/test_header diff --git a/tests/graphql/01-workflow.t b/tests/functional/graphql/01-workflow.t similarity index 100% rename from tests/graphql/01-workflow.t rename to tests/functional/graphql/01-workflow.t diff --git a/tests/graphql/01-workflow/suite.rc b/tests/functional/graphql/01-workflow/suite.rc similarity index 100% rename from tests/graphql/01-workflow/suite.rc rename to tests/functional/graphql/01-workflow/suite.rc diff --git a/tests/graphql/02-root-queries.t b/tests/functional/graphql/02-root-queries.t similarity index 100% rename from tests/graphql/02-root-queries.t rename to tests/functional/graphql/02-root-queries.t diff --git a/tests/graphql/02-root-queries/suite.rc b/tests/functional/graphql/02-root-queries/suite.rc similarity index 100% rename from tests/graphql/02-root-queries/suite.rc rename to tests/functional/graphql/02-root-queries/suite.rc diff --git a/tests/graphql/03-is-held-arg.t b/tests/functional/graphql/03-is-held-arg.t similarity index 100% rename from tests/graphql/03-is-held-arg.t rename to tests/functional/graphql/03-is-held-arg.t diff --git a/tests/graphql/03-is-held-arg/suite.rc b/tests/functional/graphql/03-is-held-arg/suite.rc similarity index 100% rename from tests/graphql/03-is-held-arg/suite.rc rename to tests/functional/graphql/03-is-held-arg/suite.rc diff --git a/tests/graphql/test_header b/tests/functional/graphql/test_header similarity index 100% rename from tests/graphql/test_header rename to tests/functional/graphql/test_header diff --git a/tests/hold-release/00-suite.t b/tests/functional/hold-release/00-suite.t similarity index 100% rename from tests/hold-release/00-suite.t rename to tests/functional/hold-release/00-suite.t diff --git a/tests/hold-release/00-suite/reference.log b/tests/functional/hold-release/00-suite/reference.log similarity index 100% rename from tests/hold-release/00-suite/reference.log rename to tests/functional/hold-release/00-suite/reference.log diff --git a/tests/hold-release/00-suite/suite.rc b/tests/functional/hold-release/00-suite/suite.rc similarity index 100% rename from tests/hold-release/00-suite/suite.rc rename to tests/functional/hold-release/00-suite/suite.rc diff --git a/tests/hold-release/01-beyond-stop.t b/tests/functional/hold-release/01-beyond-stop.t similarity index 100% rename from tests/hold-release/01-beyond-stop.t rename to tests/functional/hold-release/01-beyond-stop.t diff --git a/tests/hold-release/01-beyond-stop/reference.log b/tests/functional/hold-release/01-beyond-stop/reference.log similarity index 100% rename from tests/hold-release/01-beyond-stop/reference.log rename to tests/functional/hold-release/01-beyond-stop/reference.log diff --git a/tests/hold-release/01-beyond-stop/suite.rc b/tests/functional/hold-release/01-beyond-stop/suite.rc similarity index 100% rename from tests/hold-release/01-beyond-stop/suite.rc rename to tests/functional/hold-release/01-beyond-stop/suite.rc diff --git a/tests/hold-release/02-hold-on-spawn.t b/tests/functional/hold-release/02-hold-on-spawn.t similarity index 100% rename from tests/hold-release/02-hold-on-spawn.t rename to tests/functional/hold-release/02-hold-on-spawn.t diff --git a/tests/hold-release/02-hold-on-spawn/reference.log b/tests/functional/hold-release/02-hold-on-spawn/reference.log similarity index 100% rename from tests/hold-release/02-hold-on-spawn/reference.log rename to tests/functional/hold-release/02-hold-on-spawn/reference.log diff --git a/tests/hold-release/02-hold-on-spawn/suite.rc b/tests/functional/hold-release/02-hold-on-spawn/suite.rc similarity index 100% rename from tests/hold-release/02-hold-on-spawn/suite.rc rename to tests/functional/hold-release/02-hold-on-spawn/suite.rc diff --git a/tests/hold-release/03-release-family-exact.t b/tests/functional/hold-release/03-release-family-exact.t similarity index 100% rename from tests/hold-release/03-release-family-exact.t rename to tests/functional/hold-release/03-release-family-exact.t diff --git a/tests/hold-release/04-release-family-inexact.t b/tests/functional/hold-release/04-release-family-inexact.t similarity index 100% rename from tests/hold-release/04-release-family-inexact.t rename to tests/functional/hold-release/04-release-family-inexact.t diff --git a/tests/hold-release/05-release-task-exact.t b/tests/functional/hold-release/05-release-task-exact.t similarity index 100% rename from tests/hold-release/05-release-task-exact.t rename to tests/functional/hold-release/05-release-task-exact.t diff --git a/tests/hold-release/06-release-task-inexact.t b/tests/functional/hold-release/06-release-task-inexact.t similarity index 100% rename from tests/hold-release/06-release-task-inexact.t rename to tests/functional/hold-release/06-release-task-inexact.t diff --git a/tests/hold-release/07-hold-family-exact.t b/tests/functional/hold-release/07-hold-family-exact.t similarity index 100% rename from tests/hold-release/07-hold-family-exact.t rename to tests/functional/hold-release/07-hold-family-exact.t diff --git a/tests/hold-release/08-hold-family-inexact.t b/tests/functional/hold-release/08-hold-family-inexact.t similarity index 100% rename from tests/hold-release/08-hold-family-inexact.t rename to tests/functional/hold-release/08-hold-family-inexact.t diff --git a/tests/hold-release/09-hold-task-exact.t b/tests/functional/hold-release/09-hold-task-exact.t similarity index 100% rename from tests/hold-release/09-hold-task-exact.t rename to tests/functional/hold-release/09-hold-task-exact.t diff --git a/tests/hold-release/10-hold-task-inexact.t b/tests/functional/hold-release/10-hold-task-inexact.t similarity index 100% rename from tests/hold-release/10-hold-task-inexact.t rename to tests/functional/hold-release/10-hold-task-inexact.t diff --git a/tests/hold-release/11-retrying.t b/tests/functional/hold-release/11-retrying.t similarity index 100% rename from tests/hold-release/11-retrying.t rename to tests/functional/hold-release/11-retrying.t diff --git a/tests/hold-release/11-retrying/reference.log b/tests/functional/hold-release/11-retrying/reference.log similarity index 100% rename from tests/hold-release/11-retrying/reference.log rename to tests/functional/hold-release/11-retrying/reference.log diff --git a/tests/hold-release/11-retrying/suite.rc b/tests/functional/hold-release/11-retrying/suite.rc similarity index 100% rename from tests/hold-release/11-retrying/suite.rc rename to tests/functional/hold-release/11-retrying/suite.rc diff --git a/tests/hold-release/12-hold-then-retry.t b/tests/functional/hold-release/12-hold-then-retry.t similarity index 100% rename from tests/hold-release/12-hold-then-retry.t rename to tests/functional/hold-release/12-hold-then-retry.t diff --git a/tests/hold-release/12-hold-then-retry/reference.log b/tests/functional/hold-release/12-hold-then-retry/reference.log similarity index 100% rename from tests/hold-release/12-hold-then-retry/reference.log rename to tests/functional/hold-release/12-hold-then-retry/reference.log diff --git a/tests/hold-release/12-hold-then-retry/suite.rc b/tests/functional/hold-release/12-hold-then-retry/suite.rc similarity index 100% rename from tests/hold-release/12-hold-then-retry/suite.rc rename to tests/functional/hold-release/12-hold-then-retry/suite.rc diff --git a/tests/hold-release/17-hold-after-point.t b/tests/functional/hold-release/17-hold-after-point.t similarity index 100% rename from tests/hold-release/17-hold-after-point.t rename to tests/functional/hold-release/17-hold-after-point.t diff --git a/tests/hold-release/17-hold-after-point/reference.log b/tests/functional/hold-release/17-hold-after-point/reference.log similarity index 100% rename from tests/hold-release/17-hold-after-point/reference.log rename to tests/functional/hold-release/17-hold-after-point/reference.log diff --git a/tests/hold-release/17-hold-after-point/suite.rc b/tests/functional/hold-release/17-hold-after-point/suite.rc similarity index 100% rename from tests/hold-release/17-hold-after-point/suite.rc rename to tests/functional/hold-release/17-hold-after-point/suite.rc diff --git a/tests/hold-release/18-hold-cycle-globs.t b/tests/functional/hold-release/18-hold-cycle-globs.t similarity index 100% rename from tests/hold-release/18-hold-cycle-globs.t rename to tests/functional/hold-release/18-hold-cycle-globs.t diff --git a/tests/hold-release/18-hold-cycle-globs/reference.log b/tests/functional/hold-release/18-hold-cycle-globs/reference.log similarity index 100% rename from tests/hold-release/18-hold-cycle-globs/reference.log rename to tests/functional/hold-release/18-hold-cycle-globs/reference.log diff --git a/tests/hold-release/18-hold-cycle-globs/suite.rc b/tests/functional/hold-release/18-hold-cycle-globs/suite.rc similarity index 100% rename from tests/hold-release/18-hold-cycle-globs/suite.rc rename to tests/functional/hold-release/18-hold-cycle-globs/suite.rc diff --git a/tests/hold-release/19-no-reset-prereq-on-waiting.t b/tests/functional/hold-release/19-no-reset-prereq-on-waiting.t similarity index 100% rename from tests/hold-release/19-no-reset-prereq-on-waiting.t rename to tests/functional/hold-release/19-no-reset-prereq-on-waiting.t diff --git a/tests/hold-release/19-no-reset-prereq-on-waiting/reference.log b/tests/functional/hold-release/19-no-reset-prereq-on-waiting/reference.log similarity index 100% rename from tests/hold-release/19-no-reset-prereq-on-waiting/reference.log rename to tests/functional/hold-release/19-no-reset-prereq-on-waiting/reference.log diff --git a/tests/hold-release/19-no-reset-prereq-on-waiting/suite.rc b/tests/functional/hold-release/19-no-reset-prereq-on-waiting/suite.rc similarity index 100% rename from tests/hold-release/19-no-reset-prereq-on-waiting/suite.rc rename to tests/functional/hold-release/19-no-reset-prereq-on-waiting/suite.rc diff --git a/tests/hold-release/21-client.t b/tests/functional/hold-release/21-client.t similarity index 100% rename from tests/hold-release/21-client.t rename to tests/functional/hold-release/21-client.t diff --git a/tests/hold-release/21-client/reference.log b/tests/functional/hold-release/21-client/reference.log similarity index 100% rename from tests/hold-release/21-client/reference.log rename to tests/functional/hold-release/21-client/reference.log diff --git a/tests/hold-release/21-client/suite.rc b/tests/functional/hold-release/21-client/suite.rc similarity index 100% rename from tests/hold-release/21-client/suite.rc rename to tests/functional/hold-release/21-client/suite.rc diff --git a/tests/hold-release/hold-family/reference.log b/tests/functional/hold-release/hold-family/reference.log similarity index 100% rename from tests/hold-release/hold-family/reference.log rename to tests/functional/hold-release/hold-family/reference.log diff --git a/tests/hold-release/hold-family/suite.rc b/tests/functional/hold-release/hold-family/suite.rc similarity index 100% rename from tests/hold-release/hold-family/suite.rc rename to tests/functional/hold-release/hold-family/suite.rc diff --git a/tests/hold-release/hold-task/reference.log b/tests/functional/hold-release/hold-task/reference.log similarity index 100% rename from tests/hold-release/hold-task/reference.log rename to tests/functional/hold-release/hold-task/reference.log diff --git a/tests/hold-release/hold-task/suite.rc b/tests/functional/hold-release/hold-task/suite.rc similarity index 100% rename from tests/hold-release/hold-task/suite.rc rename to tests/functional/hold-release/hold-task/suite.rc diff --git a/tests/hold-release/release-family/reference.log b/tests/functional/hold-release/release-family/reference.log similarity index 100% rename from tests/hold-release/release-family/reference.log rename to tests/functional/hold-release/release-family/reference.log diff --git a/tests/hold-release/release-family/suite.rc b/tests/functional/hold-release/release-family/suite.rc similarity index 100% rename from tests/hold-release/release-family/suite.rc rename to tests/functional/hold-release/release-family/suite.rc diff --git a/tests/hold-release/release-task/reference.log b/tests/functional/hold-release/release-task/reference.log similarity index 100% rename from tests/hold-release/release-task/reference.log rename to tests/functional/hold-release/release-task/reference.log diff --git a/tests/hold-release/release-task/suite.rc b/tests/functional/hold-release/release-task/suite.rc similarity index 100% rename from tests/hold-release/release-task/suite.rc rename to tests/functional/hold-release/release-task/suite.rc diff --git a/tests/hold-release/run-hold-after/reference.log b/tests/functional/hold-release/run-hold-after/reference.log similarity index 100% rename from tests/hold-release/run-hold-after/reference.log rename to tests/functional/hold-release/run-hold-after/reference.log diff --git a/tests/hold-release/run-hold-after/suite.rc b/tests/functional/hold-release/run-hold-after/suite.rc similarity index 100% rename from tests/hold-release/run-hold-after/suite.rc rename to tests/functional/hold-release/run-hold-after/suite.rc diff --git a/tests/hold-release/test_header b/tests/functional/hold-release/test_header similarity index 100% rename from tests/hold-release/test_header rename to tests/functional/hold-release/test_header diff --git a/tests/host-select/00-simple.t b/tests/functional/host-select/00-simple.t similarity index 100% rename from tests/host-select/00-simple.t rename to tests/functional/host-select/00-simple.t diff --git a/tests/host-select/00-simple/bin/host-select.sh b/tests/functional/host-select/00-simple/bin/host-select.sh similarity index 100% rename from tests/host-select/00-simple/bin/host-select.sh rename to tests/functional/host-select/00-simple/bin/host-select.sh diff --git a/tests/host-select/00-simple/reference.log b/tests/functional/host-select/00-simple/reference.log similarity index 100% rename from tests/host-select/00-simple/reference.log rename to tests/functional/host-select/00-simple/reference.log diff --git a/tests/host-select/00-simple/suite.rc b/tests/functional/host-select/00-simple/suite.rc similarity index 100% rename from tests/host-select/00-simple/suite.rc rename to tests/functional/host-select/00-simple/suite.rc diff --git a/tests/host-select/test_header b/tests/functional/host-select/test_header similarity index 100% rename from tests/host-select/test_header rename to tests/functional/host-select/test_header diff --git a/tests/include-files/00-basic.t b/tests/functional/include-files/00-basic.t similarity index 100% rename from tests/include-files/00-basic.t rename to tests/functional/include-files/00-basic.t diff --git a/tests/include-files/suite/body.rc b/tests/functional/include-files/suite/body.rc similarity index 100% rename from tests/include-files/suite/body.rc rename to tests/functional/include-files/suite/body.rc diff --git a/tests/include-files/suite/ref-inlined.rc b/tests/functional/include-files/suite/ref-inlined.rc similarity index 100% rename from tests/include-files/suite/ref-inlined.rc rename to tests/functional/include-files/suite/ref-inlined.rc diff --git a/tests/include-files/suite/runtime.rc b/tests/functional/include-files/suite/runtime.rc similarity index 100% rename from tests/include-files/suite/runtime.rc rename to tests/functional/include-files/suite/runtime.rc diff --git a/tests/include-files/suite/scheduling.rc b/tests/functional/include-files/suite/scheduling.rc similarity index 100% rename from tests/include-files/suite/scheduling.rc rename to tests/functional/include-files/suite/scheduling.rc diff --git a/tests/include-files/suite/suite.rc b/tests/functional/include-files/suite/suite.rc similarity index 100% rename from tests/include-files/suite/suite.rc rename to tests/functional/include-files/suite/suite.rc diff --git a/tests/include-files/test_header b/tests/functional/include-files/test_header similarity index 100% rename from tests/include-files/test_header rename to tests/functional/include-files/test_header diff --git a/tests/inheritance/00-namespace-list.t b/tests/functional/inheritance/00-namespace-list.t similarity index 100% rename from tests/inheritance/00-namespace-list.t rename to tests/functional/inheritance/00-namespace-list.t diff --git a/tests/inheritance/00-namespace-list/suite.rc b/tests/functional/inheritance/00-namespace-list/suite.rc similarity index 100% rename from tests/inheritance/00-namespace-list/suite.rc rename to tests/functional/inheritance/00-namespace-list/suite.rc diff --git a/tests/inheritance/01-circular.t b/tests/functional/inheritance/01-circular.t similarity index 100% rename from tests/inheritance/01-circular.t rename to tests/functional/inheritance/01-circular.t diff --git a/tests/inheritance/01-circular/suite.rc b/tests/functional/inheritance/01-circular/suite.rc similarity index 100% rename from tests/inheritance/01-circular/suite.rc rename to tests/functional/inheritance/01-circular/suite.rc diff --git a/tests/inheritance/02-bad-reinherit.t b/tests/functional/inheritance/02-bad-reinherit.t similarity index 100% rename from tests/inheritance/02-bad-reinherit.t rename to tests/functional/inheritance/02-bad-reinherit.t diff --git a/tests/inheritance/02-bad-reinherit/suite.rc b/tests/functional/inheritance/02-bad-reinherit/suite.rc similarity index 100% rename from tests/inheritance/02-bad-reinherit/suite.rc rename to tests/functional/inheritance/02-bad-reinherit/suite.rc diff --git a/tests/inheritance/test_header b/tests/functional/inheritance/test_header similarity index 100% rename from tests/inheritance/test_header rename to tests/functional/inheritance/test_header diff --git a/tests/intercycle/00-past.t b/tests/functional/intercycle/00-past.t similarity index 100% rename from tests/intercycle/00-past.t rename to tests/functional/intercycle/00-past.t diff --git a/tests/intercycle/00-past/reference.log b/tests/functional/intercycle/00-past/reference.log similarity index 100% rename from tests/intercycle/00-past/reference.log rename to tests/functional/intercycle/00-past/reference.log diff --git a/tests/intercycle/00-past/suite.rc b/tests/functional/intercycle/00-past/suite.rc similarity index 100% rename from tests/intercycle/00-past/suite.rc rename to tests/functional/intercycle/00-past/suite.rc diff --git a/tests/intercycle/01-future.t b/tests/functional/intercycle/01-future.t similarity index 100% rename from tests/intercycle/01-future.t rename to tests/functional/intercycle/01-future.t diff --git a/tests/intercycle/01-future/reference.log b/tests/functional/intercycle/01-future/reference.log similarity index 100% rename from tests/intercycle/01-future/reference.log rename to tests/functional/intercycle/01-future/reference.log diff --git a/tests/intercycle/01-future/suite.rc b/tests/functional/intercycle/01-future/suite.rc similarity index 100% rename from tests/intercycle/01-future/suite.rc rename to tests/functional/intercycle/01-future/suite.rc diff --git a/tests/intercycle/02-integer-abs.t b/tests/functional/intercycle/02-integer-abs.t similarity index 100% rename from tests/intercycle/02-integer-abs.t rename to tests/functional/intercycle/02-integer-abs.t diff --git a/tests/intercycle/02-integer-abs/reference.log b/tests/functional/intercycle/02-integer-abs/reference.log similarity index 100% rename from tests/intercycle/02-integer-abs/reference.log rename to tests/functional/intercycle/02-integer-abs/reference.log diff --git a/tests/intercycle/02-integer-abs/suite.rc b/tests/functional/intercycle/02-integer-abs/suite.rc similarity index 100% rename from tests/intercycle/02-integer-abs/suite.rc rename to tests/functional/intercycle/02-integer-abs/suite.rc diff --git a/tests/intercycle/03-datetime-abs.t b/tests/functional/intercycle/03-datetime-abs.t similarity index 100% rename from tests/intercycle/03-datetime-abs.t rename to tests/functional/intercycle/03-datetime-abs.t diff --git a/tests/intercycle/03-datetime-abs/reference.log b/tests/functional/intercycle/03-datetime-abs/reference.log similarity index 100% rename from tests/intercycle/03-datetime-abs/reference.log rename to tests/functional/intercycle/03-datetime-abs/reference.log diff --git a/tests/intercycle/03-datetime-abs/suite.rc b/tests/functional/intercycle/03-datetime-abs/suite.rc similarity index 100% rename from tests/intercycle/03-datetime-abs/suite.rc rename to tests/functional/intercycle/03-datetime-abs/suite.rc diff --git a/tests/intercycle/04-datetime-abs-2.t b/tests/functional/intercycle/04-datetime-abs-2.t similarity index 100% rename from tests/intercycle/04-datetime-abs-2.t rename to tests/functional/intercycle/04-datetime-abs-2.t diff --git a/tests/intercycle/04-datetime-abs-2/reference.log b/tests/functional/intercycle/04-datetime-abs-2/reference.log similarity index 100% rename from tests/intercycle/04-datetime-abs-2/reference.log rename to tests/functional/intercycle/04-datetime-abs-2/reference.log diff --git a/tests/intercycle/04-datetime-abs-2/suite.rc b/tests/functional/intercycle/04-datetime-abs-2/suite.rc similarity index 100% rename from tests/intercycle/04-datetime-abs-2/suite.rc rename to tests/functional/intercycle/04-datetime-abs-2/suite.rc diff --git a/tests/intercycle/05-datetime-abs-3.t b/tests/functional/intercycle/05-datetime-abs-3.t similarity index 100% rename from tests/intercycle/05-datetime-abs-3.t rename to tests/functional/intercycle/05-datetime-abs-3.t diff --git a/tests/intercycle/05-datetime-abs-3/reference.log b/tests/functional/intercycle/05-datetime-abs-3/reference.log similarity index 100% rename from tests/intercycle/05-datetime-abs-3/reference.log rename to tests/functional/intercycle/05-datetime-abs-3/reference.log diff --git a/tests/intercycle/05-datetime-abs-3/suite.rc b/tests/functional/intercycle/05-datetime-abs-3/suite.rc similarity index 100% rename from tests/intercycle/05-datetime-abs-3/suite.rc rename to tests/functional/intercycle/05-datetime-abs-3/suite.rc diff --git a/tests/intercycle/test_header b/tests/functional/intercycle/test_header similarity index 100% rename from tests/intercycle/test_header rename to tests/functional/intercycle/test_header diff --git a/tests/jinja2/00-simple.t b/tests/functional/jinja2/00-simple.t similarity index 100% rename from tests/jinja2/00-simple.t rename to tests/functional/jinja2/00-simple.t diff --git a/tests/jinja2/01-include.t b/tests/functional/jinja2/01-include.t similarity index 100% rename from tests/jinja2/01-include.t rename to tests/functional/jinja2/01-include.t diff --git a/tests/jinja2/02-incomplete.t b/tests/functional/jinja2/02-incomplete.t similarity index 100% rename from tests/jinja2/02-incomplete.t rename to tests/functional/jinja2/02-incomplete.t diff --git a/tests/jinja2/03-bad.t b/tests/functional/jinja2/03-bad.t similarity index 100% rename from tests/jinja2/03-bad.t rename to tests/functional/jinja2/03-bad.t diff --git a/tests/jinja2/04-missing.t b/tests/functional/jinja2/04-missing.t similarity index 100% rename from tests/jinja2/04-missing.t rename to tests/functional/jinja2/04-missing.t diff --git a/tests/jinja2/05-commandline.t b/tests/functional/jinja2/05-commandline.t similarity index 100% rename from tests/jinja2/05-commandline.t rename to tests/functional/jinja2/05-commandline.t diff --git a/tests/jinja2/06-do-extension.t b/tests/functional/jinja2/06-do-extension.t similarity index 100% rename from tests/jinja2/06-do-extension.t rename to tests/functional/jinja2/06-do-extension.t diff --git a/tests/jinja2/07-filters.t b/tests/functional/jinja2/07-filters.t similarity index 100% rename from tests/jinja2/07-filters.t rename to tests/functional/jinja2/07-filters.t diff --git a/tests/jinja2/08-local-lib-python.t b/tests/functional/jinja2/08-local-lib-python.t similarity index 100% rename from tests/jinja2/08-local-lib-python.t rename to tests/functional/jinja2/08-local-lib-python.t diff --git a/tests/jinja2/08-local-lib-python/Jinja2Filters/qualify.py b/tests/functional/jinja2/08-local-lib-python/Jinja2Filters/qualify.py similarity index 100% rename from tests/jinja2/08-local-lib-python/Jinja2Filters/qualify.py rename to tests/functional/jinja2/08-local-lib-python/Jinja2Filters/qualify.py diff --git a/tests/jinja2/08-local-lib-python/lib/python/local_lookup.py b/tests/functional/jinja2/08-local-lib-python/lib/python/local_lookup.py similarity index 100% rename from tests/jinja2/08-local-lib-python/lib/python/local_lookup.py rename to tests/functional/jinja2/08-local-lib-python/lib/python/local_lookup.py diff --git a/tests/jinja2/08-local-lib-python/suite.rc b/tests/functional/jinja2/08-local-lib-python/suite.rc similarity index 100% rename from tests/jinja2/08-local-lib-python/suite.rc rename to tests/functional/jinja2/08-local-lib-python/suite.rc diff --git a/tests/jinja2/08-local-lib-python/suite.rc.jproc b/tests/functional/jinja2/08-local-lib-python/suite.rc.jproc similarity index 100% rename from tests/jinja2/08-local-lib-python/suite.rc.jproc rename to tests/functional/jinja2/08-local-lib-python/suite.rc.jproc diff --git a/tests/jinja2/09-custom-jinja2-filters.t b/tests/functional/jinja2/09-custom-jinja2-filters.t similarity index 100% rename from tests/jinja2/09-custom-jinja2-filters.t rename to tests/functional/jinja2/09-custom-jinja2-filters.t diff --git a/tests/jinja2/09-custom-jinja2-filters/reference.log b/tests/functional/jinja2/09-custom-jinja2-filters/reference.log similarity index 100% rename from tests/jinja2/09-custom-jinja2-filters/reference.log rename to tests/functional/jinja2/09-custom-jinja2-filters/reference.log diff --git a/tests/jinja2/09-custom-jinja2-filters/suite.rc b/tests/functional/jinja2/09-custom-jinja2-filters/suite.rc similarity index 100% rename from tests/jinja2/09-custom-jinja2-filters/suite.rc rename to tests/functional/jinja2/09-custom-jinja2-filters/suite.rc diff --git a/tests/jinja2/10-builtin-functions.t b/tests/functional/jinja2/10-builtin-functions.t similarity index 100% rename from tests/jinja2/10-builtin-functions.t rename to tests/functional/jinja2/10-builtin-functions.t diff --git a/tests/jinja2/10-builtin-functions/suite.rc b/tests/functional/jinja2/10-builtin-functions/suite.rc similarity index 100% rename from tests/jinja2/10-builtin-functions/suite.rc rename to tests/functional/jinja2/10-builtin-functions/suite.rc diff --git a/tests/jinja2/11-logging.t b/tests/functional/jinja2/11-logging.t similarity index 100% rename from tests/jinja2/11-logging.t rename to tests/functional/jinja2/11-logging.t diff --git a/tests/jinja2/commandline-set/reference.log b/tests/functional/jinja2/commandline-set/reference.log similarity index 100% rename from tests/jinja2/commandline-set/reference.log rename to tests/functional/jinja2/commandline-set/reference.log diff --git a/tests/jinja2/commandline-set/suite.rc b/tests/functional/jinja2/commandline-set/suite.rc similarity index 100% rename from tests/jinja2/commandline-set/suite.rc rename to tests/functional/jinja2/commandline-set/suite.rc diff --git a/tests/jinja2/commandline-set/vars.txt b/tests/functional/jinja2/commandline-set/vars.txt similarity index 100% rename from tests/jinja2/commandline-set/vars.txt rename to tests/functional/jinja2/commandline-set/vars.txt diff --git a/tests/jinja2/do-extension/suite.rc b/tests/functional/jinja2/do-extension/suite.rc similarity index 100% rename from tests/jinja2/do-extension/suite.rc rename to tests/functional/jinja2/do-extension/suite.rc diff --git a/tests/jinja2/filters/Jinja2Filters/hello.py b/tests/functional/jinja2/filters/Jinja2Filters/hello.py similarity index 100% rename from tests/jinja2/filters/Jinja2Filters/hello.py rename to tests/functional/jinja2/filters/Jinja2Filters/hello.py diff --git a/tests/jinja2/filters/Jinja2Filters/truly.py b/tests/functional/jinja2/filters/Jinja2Filters/truly.py similarity index 100% rename from tests/jinja2/filters/Jinja2Filters/truly.py rename to tests/functional/jinja2/filters/Jinja2Filters/truly.py diff --git a/tests/jinja2/filters/suite.rc b/tests/functional/jinja2/filters/suite.rc similarity index 100% rename from tests/jinja2/filters/suite.rc rename to tests/functional/jinja2/filters/suite.rc diff --git a/tests/jinja2/filters/suite.rc-expanded b/tests/functional/jinja2/filters/suite.rc-expanded similarity index 100% rename from tests/jinja2/filters/suite.rc-expanded rename to tests/functional/jinja2/filters/suite.rc-expanded diff --git a/tests/jinja2/include-badsyntax/runtime-bad.rc b/tests/functional/jinja2/include-badsyntax/runtime-bad.rc similarity index 100% rename from tests/jinja2/include-badsyntax/runtime-bad.rc rename to tests/functional/jinja2/include-badsyntax/runtime-bad.rc diff --git a/tests/jinja2/include-badsyntax/suite.rc b/tests/functional/jinja2/include-badsyntax/suite.rc similarity index 100% rename from tests/jinja2/include-badsyntax/suite.rc rename to tests/functional/jinja2/include-badsyntax/suite.rc diff --git a/tests/jinja2/include-incomplete/runtime-incomplete.rc b/tests/functional/jinja2/include-incomplete/runtime-incomplete.rc similarity index 100% rename from tests/jinja2/include-incomplete/runtime-incomplete.rc rename to tests/functional/jinja2/include-incomplete/runtime-incomplete.rc diff --git a/tests/jinja2/include-incomplete/suite.rc b/tests/functional/jinja2/include-incomplete/suite.rc similarity index 100% rename from tests/jinja2/include-incomplete/suite.rc rename to tests/functional/jinja2/include-incomplete/suite.rc diff --git a/tests/jinja2/include-missing/suite.rc b/tests/functional/jinja2/include-missing/suite.rc similarity index 100% rename from tests/jinja2/include-missing/suite.rc rename to tests/functional/jinja2/include-missing/suite.rc diff --git a/tests/jinja2/include/runtime.rc b/tests/functional/jinja2/include/runtime.rc similarity index 100% rename from tests/jinja2/include/runtime.rc rename to tests/functional/jinja2/include/runtime.rc diff --git a/tests/jinja2/include/suite.rc b/tests/functional/jinja2/include/suite.rc similarity index 100% rename from tests/jinja2/include/suite.rc rename to tests/functional/jinja2/include/suite.rc diff --git a/tests/jinja2/include/suite.rc-expanded b/tests/functional/jinja2/include/suite.rc-expanded similarity index 100% rename from tests/jinja2/include/suite.rc-expanded rename to tests/functional/jinja2/include/suite.rc-expanded diff --git a/tests/jinja2/simple/suite.rc b/tests/functional/jinja2/simple/suite.rc similarity index 100% rename from tests/jinja2/simple/suite.rc rename to tests/functional/jinja2/simple/suite.rc diff --git a/tests/jinja2/simple/suite.rc-expanded b/tests/functional/jinja2/simple/suite.rc-expanded similarity index 100% rename from tests/jinja2/simple/suite.rc-expanded rename to tests/functional/jinja2/simple/suite.rc-expanded diff --git a/tests/jinja2/test_header b/tests/functional/jinja2/test_header similarity index 100% rename from tests/jinja2/test_header rename to tests/functional/jinja2/test_header diff --git a/tests/job-file-trap/00-sigusr1.t b/tests/functional/job-file-trap/00-sigusr1.t similarity index 100% rename from tests/job-file-trap/00-sigusr1.t rename to tests/functional/job-file-trap/00-sigusr1.t diff --git a/tests/job-file-trap/00-sigusr1/python/background_vacation.py b/tests/functional/job-file-trap/00-sigusr1/python/background_vacation.py similarity index 100% rename from tests/job-file-trap/00-sigusr1/python/background_vacation.py rename to tests/functional/job-file-trap/00-sigusr1/python/background_vacation.py diff --git a/tests/job-file-trap/00-sigusr1/reference.log b/tests/functional/job-file-trap/00-sigusr1/reference.log similarity index 100% rename from tests/job-file-trap/00-sigusr1/reference.log rename to tests/functional/job-file-trap/00-sigusr1/reference.log diff --git a/tests/job-file-trap/00-sigusr1/suite.rc b/tests/functional/job-file-trap/00-sigusr1/suite.rc similarity index 100% rename from tests/job-file-trap/00-sigusr1/suite.rc rename to tests/functional/job-file-trap/00-sigusr1/suite.rc diff --git a/tests/job-file-trap/01-loadleveler.t b/tests/functional/job-file-trap/01-loadleveler.t similarity index 100% rename from tests/job-file-trap/01-loadleveler.t rename to tests/functional/job-file-trap/01-loadleveler.t diff --git a/tests/job-file-trap/01-loadleveler/reference.log b/tests/functional/job-file-trap/01-loadleveler/reference.log similarity index 100% rename from tests/job-file-trap/01-loadleveler/reference.log rename to tests/functional/job-file-trap/01-loadleveler/reference.log diff --git a/tests/job-file-trap/01-loadleveler/suite.rc b/tests/functional/job-file-trap/01-loadleveler/suite.rc similarity index 100% rename from tests/job-file-trap/01-loadleveler/suite.rc rename to tests/functional/job-file-trap/01-loadleveler/suite.rc diff --git a/tests/job-file-trap/02-pipefail.t b/tests/functional/job-file-trap/02-pipefail.t similarity index 100% rename from tests/job-file-trap/02-pipefail.t rename to tests/functional/job-file-trap/02-pipefail.t diff --git a/tests/job-file-trap/02-pipefail/reference.log b/tests/functional/job-file-trap/02-pipefail/reference.log similarity index 100% rename from tests/job-file-trap/02-pipefail/reference.log rename to tests/functional/job-file-trap/02-pipefail/reference.log diff --git a/tests/job-file-trap/02-pipefail/suite.rc b/tests/functional/job-file-trap/02-pipefail/suite.rc similarity index 100% rename from tests/job-file-trap/02-pipefail/suite.rc rename to tests/functional/job-file-trap/02-pipefail/suite.rc diff --git a/tests/job-file-trap/test_header b/tests/functional/job-file-trap/test_header similarity index 100% rename from tests/job-file-trap/test_header rename to tests/functional/job-file-trap/test_header diff --git a/tests/job-kill/00-local.t b/tests/functional/job-kill/00-local.t similarity index 100% rename from tests/job-kill/00-local.t rename to tests/functional/job-kill/00-local.t diff --git a/tests/job-kill/00-local/reference.log b/tests/functional/job-kill/00-local/reference.log similarity index 100% rename from tests/job-kill/00-local/reference.log rename to tests/functional/job-kill/00-local/reference.log diff --git a/tests/job-kill/00-local/suite.rc b/tests/functional/job-kill/00-local/suite.rc similarity index 100% rename from tests/job-kill/00-local/suite.rc rename to tests/functional/job-kill/00-local/suite.rc diff --git a/tests/job-kill/01-remote.t b/tests/functional/job-kill/01-remote.t similarity index 100% rename from tests/job-kill/01-remote.t rename to tests/functional/job-kill/01-remote.t diff --git a/tests/job-kill/01-remote/reference.log b/tests/functional/job-kill/01-remote/reference.log similarity index 100% rename from tests/job-kill/01-remote/reference.log rename to tests/functional/job-kill/01-remote/reference.log diff --git a/tests/job-kill/01-remote/suite.rc b/tests/functional/job-kill/01-remote/suite.rc similarity index 100% rename from tests/job-kill/01-remote/suite.rc rename to tests/functional/job-kill/01-remote/suite.rc diff --git a/tests/job-kill/02-loadleveler.t b/tests/functional/job-kill/02-loadleveler.t similarity index 100% rename from tests/job-kill/02-loadleveler.t rename to tests/functional/job-kill/02-loadleveler.t diff --git a/tests/job-kill/02-loadleveler/reference.log b/tests/functional/job-kill/02-loadleveler/reference.log similarity index 100% rename from tests/job-kill/02-loadleveler/reference.log rename to tests/functional/job-kill/02-loadleveler/reference.log diff --git a/tests/job-kill/02-loadleveler/suite.rc b/tests/functional/job-kill/02-loadleveler/suite.rc similarity index 100% rename from tests/job-kill/02-loadleveler/suite.rc rename to tests/functional/job-kill/02-loadleveler/suite.rc diff --git a/tests/job-kill/03-slurm.t b/tests/functional/job-kill/03-slurm.t similarity index 100% rename from tests/job-kill/03-slurm.t rename to tests/functional/job-kill/03-slurm.t diff --git a/tests/job-kill/03-slurm/reference.log b/tests/functional/job-kill/03-slurm/reference.log similarity index 100% rename from tests/job-kill/03-slurm/reference.log rename to tests/functional/job-kill/03-slurm/reference.log diff --git a/tests/job-kill/03-slurm/suite.rc b/tests/functional/job-kill/03-slurm/suite.rc similarity index 100% rename from tests/job-kill/03-slurm/suite.rc rename to tests/functional/job-kill/03-slurm/suite.rc diff --git a/tests/job-kill/04-pbs.t b/tests/functional/job-kill/04-pbs.t similarity index 100% rename from tests/job-kill/04-pbs.t rename to tests/functional/job-kill/04-pbs.t diff --git a/tests/job-kill/04-pbs/reference.log b/tests/functional/job-kill/04-pbs/reference.log similarity index 100% rename from tests/job-kill/04-pbs/reference.log rename to tests/functional/job-kill/04-pbs/reference.log diff --git a/tests/job-kill/04-pbs/suite.rc b/tests/functional/job-kill/04-pbs/suite.rc similarity index 100% rename from tests/job-kill/04-pbs/suite.rc rename to tests/functional/job-kill/04-pbs/suite.rc diff --git a/tests/job-kill/test_header b/tests/functional/job-kill/test_header similarity index 100% rename from tests/job-kill/test_header rename to tests/functional/job-kill/test_header diff --git a/tests/job-submission/00-user.t b/tests/functional/job-submission/00-user.t similarity index 100% rename from tests/job-submission/00-user.t rename to tests/functional/job-submission/00-user.t diff --git a/tests/job-submission/00-user/lib/python/my_background2.py b/tests/functional/job-submission/00-user/lib/python/my_background2.py similarity index 100% rename from tests/job-submission/00-user/lib/python/my_background2.py rename to tests/functional/job-submission/00-user/lib/python/my_background2.py diff --git a/tests/job-submission/00-user/python/my_background.py b/tests/functional/job-submission/00-user/python/my_background.py similarity index 100% rename from tests/job-submission/00-user/python/my_background.py rename to tests/functional/job-submission/00-user/python/my_background.py diff --git a/tests/job-submission/00-user/reference.log b/tests/functional/job-submission/00-user/reference.log similarity index 100% rename from tests/job-submission/00-user/reference.log rename to tests/functional/job-submission/00-user/reference.log diff --git a/tests/job-submission/00-user/suite.rc b/tests/functional/job-submission/00-user/suite.rc similarity index 100% rename from tests/job-submission/00-user/suite.rc rename to tests/functional/job-submission/00-user/suite.rc diff --git a/tests/job-submission/01-job-nn-localhost.t b/tests/functional/job-submission/01-job-nn-localhost.t similarity index 100% rename from tests/job-submission/01-job-nn-localhost.t rename to tests/functional/job-submission/01-job-nn-localhost.t diff --git a/tests/job-submission/01-job-nn-localhost/db.sqlite3 b/tests/functional/job-submission/01-job-nn-localhost/db.sqlite3 similarity index 100% rename from tests/job-submission/01-job-nn-localhost/db.sqlite3 rename to tests/functional/job-submission/01-job-nn-localhost/db.sqlite3 diff --git a/tests/job-submission/01-job-nn-localhost/reference.log b/tests/functional/job-submission/01-job-nn-localhost/reference.log similarity index 100% rename from tests/job-submission/01-job-nn-localhost/reference.log rename to tests/functional/job-submission/01-job-nn-localhost/reference.log diff --git a/tests/job-submission/01-job-nn-localhost/suite.rc b/tests/functional/job-submission/01-job-nn-localhost/suite.rc similarity index 100% rename from tests/job-submission/01-job-nn-localhost/suite.rc rename to tests/functional/job-submission/01-job-nn-localhost/suite.rc diff --git a/tests/job-submission/02-job-nn-remote-host b/tests/functional/job-submission/02-job-nn-remote-host similarity index 100% rename from tests/job-submission/02-job-nn-remote-host rename to tests/functional/job-submission/02-job-nn-remote-host diff --git a/tests/job-submission/02-job-nn-remote-host.t b/tests/functional/job-submission/02-job-nn-remote-host.t similarity index 100% rename from tests/job-submission/02-job-nn-remote-host.t rename to tests/functional/job-submission/02-job-nn-remote-host.t diff --git a/tests/job-submission/03-job-nn-remote-host-with-shared-fs b/tests/functional/job-submission/03-job-nn-remote-host-with-shared-fs similarity index 100% rename from tests/job-submission/03-job-nn-remote-host-with-shared-fs rename to tests/functional/job-submission/03-job-nn-remote-host-with-shared-fs diff --git a/tests/job-submission/03-job-nn-remote-host-with-shared-fs.t b/tests/functional/job-submission/03-job-nn-remote-host-with-shared-fs.t similarity index 100% rename from tests/job-submission/03-job-nn-remote-host-with-shared-fs.t rename to tests/functional/job-submission/03-job-nn-remote-host-with-shared-fs.t diff --git a/tests/job-submission/04-submit-num.t b/tests/functional/job-submission/04-submit-num.t similarity index 100% rename from tests/job-submission/04-submit-num.t rename to tests/functional/job-submission/04-submit-num.t diff --git a/tests/job-submission/04-submit-num/suite.rc b/tests/functional/job-submission/04-submit-num/suite.rc similarity index 100% rename from tests/job-submission/04-submit-num/suite.rc rename to tests/functional/job-submission/04-submit-num/suite.rc diff --git a/tests/job-submission/06-garbage.t b/tests/functional/job-submission/06-garbage.t similarity index 100% rename from tests/job-submission/06-garbage.t rename to tests/functional/job-submission/06-garbage.t diff --git a/tests/job-submission/06-garbage/lib/bad.py b/tests/functional/job-submission/06-garbage/lib/bad.py similarity index 100% rename from tests/job-submission/06-garbage/lib/bad.py rename to tests/functional/job-submission/06-garbage/lib/bad.py diff --git a/tests/job-submission/06-garbage/reference.log b/tests/functional/job-submission/06-garbage/reference.log similarity index 100% rename from tests/job-submission/06-garbage/reference.log rename to tests/functional/job-submission/06-garbage/reference.log diff --git a/tests/job-submission/06-garbage/suite.rc b/tests/functional/job-submission/06-garbage/suite.rc similarity index 100% rename from tests/job-submission/06-garbage/suite.rc rename to tests/functional/job-submission/06-garbage/suite.rc diff --git a/tests/job-submission/07-multi.t b/tests/functional/job-submission/07-multi.t similarity index 100% rename from tests/job-submission/07-multi.t rename to tests/functional/job-submission/07-multi.t diff --git a/tests/job-submission/07-multi/reference.log b/tests/functional/job-submission/07-multi/reference.log similarity index 100% rename from tests/job-submission/07-multi/reference.log rename to tests/functional/job-submission/07-multi/reference.log diff --git a/tests/job-submission/07-multi/suite.rc b/tests/functional/job-submission/07-multi/suite.rc similarity index 100% rename from tests/job-submission/07-multi/suite.rc rename to tests/functional/job-submission/07-multi/suite.rc diff --git a/tests/job-submission/08-activity-log-host.t b/tests/functional/job-submission/08-activity-log-host.t similarity index 100% rename from tests/job-submission/08-activity-log-host.t rename to tests/functional/job-submission/08-activity-log-host.t diff --git a/tests/job-submission/08-activity-log-host/reference.log b/tests/functional/job-submission/08-activity-log-host/reference.log similarity index 100% rename from tests/job-submission/08-activity-log-host/reference.log rename to tests/functional/job-submission/08-activity-log-host/reference.log diff --git a/tests/job-submission/08-activity-log-host/suite.rc b/tests/functional/job-submission/08-activity-log-host/suite.rc similarity index 100% rename from tests/job-submission/08-activity-log-host/suite.rc rename to tests/functional/job-submission/08-activity-log-host/suite.rc diff --git a/tests/job-submission/09-activity-log-host-bad-submit.t b/tests/functional/job-submission/09-activity-log-host-bad-submit.t similarity index 100% rename from tests/job-submission/09-activity-log-host-bad-submit.t rename to tests/functional/job-submission/09-activity-log-host-bad-submit.t diff --git a/tests/job-submission/09-activity-log-host-bad-submit/reference.log b/tests/functional/job-submission/09-activity-log-host-bad-submit/reference.log similarity index 100% rename from tests/job-submission/09-activity-log-host-bad-submit/reference.log rename to tests/functional/job-submission/09-activity-log-host-bad-submit/reference.log diff --git a/tests/job-submission/09-activity-log-host-bad-submit/suite.rc b/tests/functional/job-submission/09-activity-log-host-bad-submit/suite.rc similarity index 100% rename from tests/job-submission/09-activity-log-host-bad-submit/suite.rc rename to tests/functional/job-submission/09-activity-log-host-bad-submit/suite.rc diff --git a/tests/job-submission/10-at-shell.t b/tests/functional/job-submission/10-at-shell.t similarity index 100% rename from tests/job-submission/10-at-shell.t rename to tests/functional/job-submission/10-at-shell.t diff --git a/tests/job-submission/10-at-shell/reference.log b/tests/functional/job-submission/10-at-shell/reference.log similarity index 100% rename from tests/job-submission/10-at-shell/reference.log rename to tests/functional/job-submission/10-at-shell/reference.log diff --git a/tests/job-submission/10-at-shell/suite.rc b/tests/functional/job-submission/10-at-shell/suite.rc similarity index 100% rename from tests/job-submission/10-at-shell/suite.rc rename to tests/functional/job-submission/10-at-shell/suite.rc diff --git a/tests/job-submission/11-garbage-host-command.t b/tests/functional/job-submission/11-garbage-host-command.t similarity index 100% rename from tests/job-submission/11-garbage-host-command.t rename to tests/functional/job-submission/11-garbage-host-command.t diff --git a/tests/job-submission/11-garbage-host-command/reference.log b/tests/functional/job-submission/11-garbage-host-command/reference.log similarity index 100% rename from tests/job-submission/11-garbage-host-command/reference.log rename to tests/functional/job-submission/11-garbage-host-command/reference.log diff --git a/tests/job-submission/11-garbage-host-command/suite.rc b/tests/functional/job-submission/11-garbage-host-command/suite.rc similarity index 100% rename from tests/job-submission/11-garbage-host-command/suite.rc rename to tests/functional/job-submission/11-garbage-host-command/suite.rc diff --git a/tests/job-submission/12-tidy-submits-of-prev-run.t b/tests/functional/job-submission/12-tidy-submits-of-prev-run.t similarity index 100% rename from tests/job-submission/12-tidy-submits-of-prev-run.t rename to tests/functional/job-submission/12-tidy-submits-of-prev-run.t diff --git a/tests/job-submission/12-tidy-submits-of-prev-run/reference.log b/tests/functional/job-submission/12-tidy-submits-of-prev-run/reference.log similarity index 100% rename from tests/job-submission/12-tidy-submits-of-prev-run/reference.log rename to tests/functional/job-submission/12-tidy-submits-of-prev-run/reference.log diff --git a/tests/job-submission/12-tidy-submits-of-prev-run/suite.rc b/tests/functional/job-submission/12-tidy-submits-of-prev-run/suite.rc similarity index 100% rename from tests/job-submission/12-tidy-submits-of-prev-run/suite.rc rename to tests/functional/job-submission/12-tidy-submits-of-prev-run/suite.rc diff --git a/tests/job-submission/13-tidy-submits-of-prev-run-remote-host b/tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host similarity index 100% rename from tests/job-submission/13-tidy-submits-of-prev-run-remote-host rename to tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host diff --git a/tests/job-submission/13-tidy-submits-of-prev-run-remote-host.t b/tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host.t similarity index 100% rename from tests/job-submission/13-tidy-submits-of-prev-run-remote-host.t rename to tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host.t diff --git a/tests/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs b/tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs similarity index 100% rename from tests/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs rename to tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs diff --git a/tests/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t b/tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t similarity index 100% rename from tests/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t rename to tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t diff --git a/tests/job-submission/15-garbage-host-command-2.t b/tests/functional/job-submission/15-garbage-host-command-2.t similarity index 100% rename from tests/job-submission/15-garbage-host-command-2.t rename to tests/functional/job-submission/15-garbage-host-command-2.t diff --git a/tests/job-submission/15-garbage-host-command-2/bin/my-host-select b/tests/functional/job-submission/15-garbage-host-command-2/bin/my-host-select similarity index 100% rename from tests/job-submission/15-garbage-host-command-2/bin/my-host-select rename to tests/functional/job-submission/15-garbage-host-command-2/bin/my-host-select diff --git a/tests/job-submission/15-garbage-host-command-2/reference.log b/tests/functional/job-submission/15-garbage-host-command-2/reference.log similarity index 100% rename from tests/job-submission/15-garbage-host-command-2/reference.log rename to tests/functional/job-submission/15-garbage-host-command-2/reference.log diff --git a/tests/job-submission/15-garbage-host-command-2/suite.rc b/tests/functional/job-submission/15-garbage-host-command-2/suite.rc similarity index 100% rename from tests/job-submission/15-garbage-host-command-2/suite.rc rename to tests/functional/job-submission/15-garbage-host-command-2/suite.rc diff --git a/tests/job-submission/16-timeout.t b/tests/functional/job-submission/16-timeout.t similarity index 100% rename from tests/job-submission/16-timeout.t rename to tests/functional/job-submission/16-timeout.t diff --git a/tests/job-submission/16-timeout/suite.rc b/tests/functional/job-submission/16-timeout/suite.rc similarity index 100% rename from tests/job-submission/16-timeout/suite.rc rename to tests/functional/job-submission/16-timeout/suite.rc diff --git a/tests/job-submission/17-remote-localtime.t b/tests/functional/job-submission/17-remote-localtime.t similarity index 100% rename from tests/job-submission/17-remote-localtime.t rename to tests/functional/job-submission/17-remote-localtime.t diff --git a/tests/job-submission/17-remote-localtime/reference.log b/tests/functional/job-submission/17-remote-localtime/reference.log similarity index 100% rename from tests/job-submission/17-remote-localtime/reference.log rename to tests/functional/job-submission/17-remote-localtime/reference.log diff --git a/tests/job-submission/17-remote-localtime/suite.rc b/tests/functional/job-submission/17-remote-localtime/suite.rc similarity index 100% rename from tests/job-submission/17-remote-localtime/suite.rc rename to tests/functional/job-submission/17-remote-localtime/suite.rc diff --git a/tests/job-submission/test_header b/tests/functional/job-submission/test_header similarity index 100% rename from tests/job-submission/test_header rename to tests/functional/job-submission/test_header diff --git a/tests/jobscript/00-torture.t b/tests/functional/jobscript/00-torture.t similarity index 100% rename from tests/jobscript/00-torture.t rename to tests/functional/jobscript/00-torture.t diff --git a/tests/jobscript/00-torture/bin/foo.sh b/tests/functional/jobscript/00-torture/bin/foo.sh similarity index 100% rename from tests/jobscript/00-torture/bin/foo.sh rename to tests/functional/jobscript/00-torture/bin/foo.sh diff --git a/tests/jobscript/00-torture/foo.ref-jobfile b/tests/functional/jobscript/00-torture/foo.ref-jobfile similarity index 100% rename from tests/jobscript/00-torture/foo.ref-jobfile rename to tests/functional/jobscript/00-torture/foo.ref-jobfile diff --git a/tests/jobscript/00-torture/reference.log b/tests/functional/jobscript/00-torture/reference.log similarity index 100% rename from tests/jobscript/00-torture/reference.log rename to tests/functional/jobscript/00-torture/reference.log diff --git a/tests/jobscript/00-torture/suite.rc b/tests/functional/jobscript/00-torture/suite.rc similarity index 100% rename from tests/jobscript/00-torture/suite.rc rename to tests/functional/jobscript/00-torture/suite.rc diff --git a/tests/jobscript/01-multi.t b/tests/functional/jobscript/01-multi.t similarity index 100% rename from tests/jobscript/01-multi.t rename to tests/functional/jobscript/01-multi.t diff --git a/tests/jobscript/02-cycling.t b/tests/functional/jobscript/02-cycling.t similarity index 100% rename from tests/jobscript/02-cycling.t rename to tests/functional/jobscript/02-cycling.t diff --git a/tests/jobscript/03-copyable-environment-variables.t b/tests/functional/jobscript/03-copyable-environment-variables.t similarity index 100% rename from tests/jobscript/03-copyable-environment-variables.t rename to tests/functional/jobscript/03-copyable-environment-variables.t diff --git a/tests/jobscript/03-copyable-environment-variables/reference.log b/tests/functional/jobscript/03-copyable-environment-variables/reference.log similarity index 100% rename from tests/jobscript/03-copyable-environment-variables/reference.log rename to tests/functional/jobscript/03-copyable-environment-variables/reference.log diff --git a/tests/jobscript/03-copyable-environment-variables/suite.rc b/tests/functional/jobscript/03-copyable-environment-variables/suite.rc similarity index 100% rename from tests/jobscript/03-copyable-environment-variables/suite.rc rename to tests/functional/jobscript/03-copyable-environment-variables/suite.rc diff --git a/tests/jobscript/04-global-initial-scripting.t b/tests/functional/jobscript/04-global-initial-scripting.t similarity index 100% rename from tests/jobscript/04-global-initial-scripting.t rename to tests/functional/jobscript/04-global-initial-scripting.t diff --git a/tests/jobscript/04-global-initial-scripting/reference.log b/tests/functional/jobscript/04-global-initial-scripting/reference.log similarity index 100% rename from tests/jobscript/04-global-initial-scripting/reference.log rename to tests/functional/jobscript/04-global-initial-scripting/reference.log diff --git a/tests/jobscript/04-global-initial-scripting/suite.rc b/tests/functional/jobscript/04-global-initial-scripting/suite.rc similarity index 100% rename from tests/jobscript/04-global-initial-scripting/suite.rc rename to tests/functional/jobscript/04-global-initial-scripting/suite.rc diff --git a/tests/jobscript/05-global-config.t b/tests/functional/jobscript/05-global-config.t similarity index 100% rename from tests/jobscript/05-global-config.t rename to tests/functional/jobscript/05-global-config.t diff --git a/tests/jobscript/05-global-config/reference.log b/tests/functional/jobscript/05-global-config/reference.log similarity index 100% rename from tests/jobscript/05-global-config/reference.log rename to tests/functional/jobscript/05-global-config/reference.log diff --git a/tests/jobscript/05-global-config/suite.rc b/tests/functional/jobscript/05-global-config/suite.rc similarity index 100% rename from tests/jobscript/05-global-config/suite.rc rename to tests/functional/jobscript/05-global-config/suite.rc diff --git a/tests/jobscript/06-slurm-no-directives.t b/tests/functional/jobscript/06-slurm-no-directives.t similarity index 100% rename from tests/jobscript/06-slurm-no-directives.t rename to tests/functional/jobscript/06-slurm-no-directives.t diff --git a/tests/jobscript/06-slurm-no-directives/suite.rc b/tests/functional/jobscript/06-slurm-no-directives/suite.rc similarity index 100% rename from tests/jobscript/06-slurm-no-directives/suite.rc rename to tests/functional/jobscript/06-slurm-no-directives/suite.rc diff --git a/tests/jobscript/07-traps-failure.t b/tests/functional/jobscript/07-traps-failure.t similarity index 100% rename from tests/jobscript/07-traps-failure.t rename to tests/functional/jobscript/07-traps-failure.t diff --git a/tests/jobscript/07-traps-failure/suite.rc b/tests/functional/jobscript/07-traps-failure/suite.rc similarity index 100% rename from tests/jobscript/07-traps-failure/suite.rc rename to tests/functional/jobscript/07-traps-failure/suite.rc diff --git a/tests/jobscript/08-pbs-job-name-len-max.t b/tests/functional/jobscript/08-pbs-job-name-len-max.t similarity index 100% rename from tests/jobscript/08-pbs-job-name-len-max.t rename to tests/functional/jobscript/08-pbs-job-name-len-max.t diff --git a/tests/jobscript/08-pbs-job-name-len-max/suite.rc b/tests/functional/jobscript/08-pbs-job-name-len-max/suite.rc similarity index 100% rename from tests/jobscript/08-pbs-job-name-len-max/suite.rc rename to tests/functional/jobscript/08-pbs-job-name-len-max/suite.rc diff --git a/tests/jobscript/09-icp.t b/tests/functional/jobscript/09-icp.t similarity index 100% rename from tests/jobscript/09-icp.t rename to tests/functional/jobscript/09-icp.t diff --git a/tests/jobscript/10-bad-syntax.t b/tests/functional/jobscript/10-bad-syntax.t similarity index 100% rename from tests/jobscript/10-bad-syntax.t rename to tests/functional/jobscript/10-bad-syntax.t diff --git a/tests/jobscript/10-bad-syntax/reference.log b/tests/functional/jobscript/10-bad-syntax/reference.log similarity index 100% rename from tests/jobscript/10-bad-syntax/reference.log rename to tests/functional/jobscript/10-bad-syntax/reference.log diff --git a/tests/jobscript/10-bad-syntax/suite.rc b/tests/functional/jobscript/10-bad-syntax/suite.rc similarity index 100% rename from tests/jobscript/10-bad-syntax/suite.rc rename to tests/functional/jobscript/10-bad-syntax/suite.rc diff --git a/tests/jobscript/12-err-script.t b/tests/functional/jobscript/12-err-script.t similarity index 100% rename from tests/jobscript/12-err-script.t rename to tests/functional/jobscript/12-err-script.t diff --git a/tests/jobscript/12-err-script/reference.log b/tests/functional/jobscript/12-err-script/reference.log similarity index 100% rename from tests/jobscript/12-err-script/reference.log rename to tests/functional/jobscript/12-err-script/reference.log diff --git a/tests/jobscript/12-err-script/suite.rc b/tests/functional/jobscript/12-err-script/suite.rc similarity index 100% rename from tests/jobscript/12-err-script/suite.rc rename to tests/functional/jobscript/12-err-script/suite.rc diff --git a/tests/jobscript/13-hostname.t b/tests/functional/jobscript/13-hostname.t similarity index 100% rename from tests/jobscript/13-hostname.t rename to tests/functional/jobscript/13-hostname.t diff --git a/tests/jobscript/13-hostname/reference.log b/tests/functional/jobscript/13-hostname/reference.log similarity index 100% rename from tests/jobscript/13-hostname/reference.log rename to tests/functional/jobscript/13-hostname/reference.log diff --git a/tests/jobscript/13-hostname/suite.rc b/tests/functional/jobscript/13-hostname/suite.rc similarity index 100% rename from tests/jobscript/13-hostname/suite.rc rename to tests/functional/jobscript/13-hostname/suite.rc diff --git a/tests/jobscript/14-sge-format.t b/tests/functional/jobscript/14-sge-format.t similarity index 100% rename from tests/jobscript/14-sge-format.t rename to tests/functional/jobscript/14-sge-format.t diff --git a/tests/jobscript/14-sge-format/suite.rc b/tests/functional/jobscript/14-sge-format/suite.rc similarity index 100% rename from tests/jobscript/14-sge-format/suite.rc rename to tests/functional/jobscript/14-sge-format/suite.rc diff --git a/tests/jobscript/15-semicolon.t b/tests/functional/jobscript/15-semicolon.t similarity index 100% rename from tests/jobscript/15-semicolon.t rename to tests/functional/jobscript/15-semicolon.t diff --git a/tests/jobscript/15-semicolon/reference.log b/tests/functional/jobscript/15-semicolon/reference.log similarity index 100% rename from tests/jobscript/15-semicolon/reference.log rename to tests/functional/jobscript/15-semicolon/reference.log diff --git a/tests/jobscript/15-semicolon/suite.rc b/tests/functional/jobscript/15-semicolon/suite.rc similarity index 100% rename from tests/jobscript/15-semicolon/suite.rc rename to tests/functional/jobscript/15-semicolon/suite.rc diff --git a/tests/jobscript/16-midfail.t b/tests/functional/jobscript/16-midfail.t similarity index 100% rename from tests/jobscript/16-midfail.t rename to tests/functional/jobscript/16-midfail.t diff --git a/tests/jobscript/16-midfail/reference.log b/tests/functional/jobscript/16-midfail/reference.log similarity index 100% rename from tests/jobscript/16-midfail/reference.log rename to tests/functional/jobscript/16-midfail/reference.log diff --git a/tests/jobscript/16-midfail/suite.rc b/tests/functional/jobscript/16-midfail/suite.rc similarity index 100% rename from tests/jobscript/16-midfail/suite.rc rename to tests/functional/jobscript/16-midfail/suite.rc diff --git a/tests/jobscript/17-envfail.t b/tests/functional/jobscript/17-envfail.t similarity index 100% rename from tests/jobscript/17-envfail.t rename to tests/functional/jobscript/17-envfail.t diff --git a/tests/jobscript/17-envfail/reference.log b/tests/functional/jobscript/17-envfail/reference.log similarity index 100% rename from tests/jobscript/17-envfail/reference.log rename to tests/functional/jobscript/17-envfail/reference.log diff --git a/tests/jobscript/17-envfail/suite.rc b/tests/functional/jobscript/17-envfail/suite.rc similarity index 100% rename from tests/jobscript/17-envfail/suite.rc rename to tests/functional/jobscript/17-envfail/suite.rc diff --git a/tests/jobscript/18-env-task-dependencies.t b/tests/functional/jobscript/18-env-task-dependencies.t similarity index 100% rename from tests/jobscript/18-env-task-dependencies.t rename to tests/functional/jobscript/18-env-task-dependencies.t diff --git a/tests/jobscript/18-env-task-dependencies/reference.log b/tests/functional/jobscript/18-env-task-dependencies/reference.log similarity index 100% rename from tests/jobscript/18-env-task-dependencies/reference.log rename to tests/functional/jobscript/18-env-task-dependencies/reference.log diff --git a/tests/jobscript/18-env-task-dependencies/suite.rc b/tests/functional/jobscript/18-env-task-dependencies/suite.rc similarity index 100% rename from tests/jobscript/18-env-task-dependencies/suite.rc rename to tests/functional/jobscript/18-env-task-dependencies/suite.rc diff --git a/tests/jobscript/18-no-err.t b/tests/functional/jobscript/18-no-err.t similarity index 100% rename from tests/jobscript/18-no-err.t rename to tests/functional/jobscript/18-no-err.t diff --git a/tests/jobscript/18-no-err/suite.rc b/tests/functional/jobscript/18-no-err/suite.rc similarity index 100% rename from tests/jobscript/18-no-err/suite.rc rename to tests/functional/jobscript/18-no-err/suite.rc diff --git a/tests/jobscript/19-exit-script.t b/tests/functional/jobscript/19-exit-script.t similarity index 100% rename from tests/jobscript/19-exit-script.t rename to tests/functional/jobscript/19-exit-script.t diff --git a/tests/jobscript/19-exit-script/suite.rc b/tests/functional/jobscript/19-exit-script/suite.rc similarity index 100% rename from tests/jobscript/19-exit-script/suite.rc rename to tests/functional/jobscript/19-exit-script/suite.rc diff --git a/tests/jobscript/20-isodatetime-envs.t b/tests/functional/jobscript/20-isodatetime-envs.t similarity index 100% rename from tests/jobscript/20-isodatetime-envs.t rename to tests/functional/jobscript/20-isodatetime-envs.t diff --git a/tests/jobscript/cycling/bin/foo.sh b/tests/functional/jobscript/cycling/bin/foo.sh similarity index 100% rename from tests/jobscript/cycling/bin/foo.sh rename to tests/functional/jobscript/cycling/bin/foo.sh diff --git a/tests/jobscript/cycling/foo.ref-jobfile b/tests/functional/jobscript/cycling/foo.ref-jobfile similarity index 100% rename from tests/jobscript/cycling/foo.ref-jobfile rename to tests/functional/jobscript/cycling/foo.ref-jobfile diff --git a/tests/jobscript/cycling/reference.log b/tests/functional/jobscript/cycling/reference.log similarity index 100% rename from tests/jobscript/cycling/reference.log rename to tests/functional/jobscript/cycling/reference.log diff --git a/tests/jobscript/cycling/suite.rc b/tests/functional/jobscript/cycling/suite.rc similarity index 100% rename from tests/jobscript/cycling/suite.rc rename to tests/functional/jobscript/cycling/suite.rc diff --git a/tests/jobscript/multi/bah.pre b/tests/functional/jobscript/multi/bah.pre similarity index 100% rename from tests/jobscript/multi/bah.pre rename to tests/functional/jobscript/multi/bah.pre diff --git a/tests/jobscript/multi/bar.post b/tests/functional/jobscript/multi/bar.post similarity index 100% rename from tests/jobscript/multi/bar.post rename to tests/functional/jobscript/multi/bar.post diff --git a/tests/jobscript/multi/bar.pre b/tests/functional/jobscript/multi/bar.pre similarity index 100% rename from tests/jobscript/multi/bar.pre rename to tests/functional/jobscript/multi/bar.pre diff --git a/tests/jobscript/multi/bug.cmd b/tests/functional/jobscript/multi/bug.cmd similarity index 100% rename from tests/jobscript/multi/bug.cmd rename to tests/functional/jobscript/multi/bug.cmd diff --git a/tests/jobscript/multi/exp.cmd b/tests/functional/jobscript/multi/exp.cmd similarity index 100% rename from tests/jobscript/multi/exp.cmd rename to tests/functional/jobscript/multi/exp.cmd diff --git a/tests/jobscript/multi/foo.pre b/tests/functional/jobscript/multi/foo.pre similarity index 100% rename from tests/jobscript/multi/foo.pre rename to tests/functional/jobscript/multi/foo.pre diff --git a/tests/jobscript/multi/hum.post b/tests/functional/jobscript/multi/hum.post similarity index 100% rename from tests/jobscript/multi/hum.post rename to tests/functional/jobscript/multi/hum.post diff --git a/tests/jobscript/multi/qux.pre b/tests/functional/jobscript/multi/qux.pre similarity index 100% rename from tests/jobscript/multi/qux.pre rename to tests/functional/jobscript/multi/qux.pre diff --git a/tests/jobscript/multi/reg.cmd b/tests/functional/jobscript/multi/reg.cmd similarity index 100% rename from tests/jobscript/multi/reg.cmd rename to tests/functional/jobscript/multi/reg.cmd diff --git a/tests/jobscript/multi/suite.rc b/tests/functional/jobscript/multi/suite.rc similarity index 100% rename from tests/jobscript/multi/suite.rc rename to tests/functional/jobscript/multi/suite.rc diff --git a/tests/jobscript/test_header b/tests/functional/jobscript/test_header similarity index 100% rename from tests/jobscript/test_header rename to tests/functional/jobscript/test_header diff --git a/tests/lib/bash/test_header b/tests/functional/lib/bash/test_header similarity index 100% rename from tests/lib/bash/test_header rename to tests/functional/lib/bash/test_header diff --git a/tests/lib/python/diffr.py b/tests/functional/lib/python/diffr.py similarity index 100% rename from tests/lib/python/diffr.py rename to tests/functional/lib/python/diffr.py diff --git a/tests/lib/python/test_diffr.py b/tests/functional/lib/python/test_diffr.py similarity index 100% rename from tests/lib/python/test_diffr.py rename to tests/functional/lib/python/test_diffr.py diff --git a/tests/logging/02-duplicates.t b/tests/functional/logging/02-duplicates.t similarity index 100% rename from tests/logging/02-duplicates.t rename to tests/functional/logging/02-duplicates.t diff --git a/tests/logging/02-duplicates/suite.rc b/tests/functional/logging/02-duplicates/suite.rc similarity index 100% rename from tests/logging/02-duplicates/suite.rc rename to tests/functional/logging/02-duplicates/suite.rc diff --git a/tests/logging/03-roll.t b/tests/functional/logging/03-roll.t similarity index 100% rename from tests/logging/03-roll.t rename to tests/functional/logging/03-roll.t diff --git a/tests/logging/test_header b/tests/functional/logging/test_header similarity index 100% rename from tests/logging/test_header rename to tests/functional/logging/test_header diff --git a/tests/message-triggers/00-basic.t b/tests/functional/message-triggers/00-basic.t similarity index 100% rename from tests/message-triggers/00-basic.t rename to tests/functional/message-triggers/00-basic.t diff --git a/tests/message-triggers/00-basic/reference.log b/tests/functional/message-triggers/00-basic/reference.log similarity index 100% rename from tests/message-triggers/00-basic/reference.log rename to tests/functional/message-triggers/00-basic/reference.log diff --git a/tests/message-triggers/00-basic/suite.rc b/tests/functional/message-triggers/00-basic/suite.rc similarity index 100% rename from tests/message-triggers/00-basic/suite.rc rename to tests/functional/message-triggers/00-basic/suite.rc diff --git a/tests/message-triggers/02-action.t b/tests/functional/message-triggers/02-action.t similarity index 100% rename from tests/message-triggers/02-action.t rename to tests/functional/message-triggers/02-action.t diff --git a/tests/message-triggers/02-action/suite.rc b/tests/functional/message-triggers/02-action/suite.rc similarity index 100% rename from tests/message-triggers/02-action/suite.rc rename to tests/functional/message-triggers/02-action/suite.rc diff --git a/tests/message-triggers/test_header b/tests/functional/message-triggers/test_header similarity index 100% rename from tests/message-triggers/test_header rename to tests/functional/message-triggers/test_header diff --git a/tests/modes/00-simulation.t b/tests/functional/modes/00-simulation.t similarity index 100% rename from tests/modes/00-simulation.t rename to tests/functional/modes/00-simulation.t diff --git a/tests/modes/00-simulation/reference.log b/tests/functional/modes/00-simulation/reference.log similarity index 100% rename from tests/modes/00-simulation/reference.log rename to tests/functional/modes/00-simulation/reference.log diff --git a/tests/modes/00-simulation/suite.rc b/tests/functional/modes/00-simulation/suite.rc similarity index 100% rename from tests/modes/00-simulation/suite.rc rename to tests/functional/modes/00-simulation/suite.rc diff --git a/tests/modes/01-dummy.t b/tests/functional/modes/01-dummy.t similarity index 100% rename from tests/modes/01-dummy.t rename to tests/functional/modes/01-dummy.t diff --git a/tests/modes/01-dummy/reference.log b/tests/functional/modes/01-dummy/reference.log similarity index 100% rename from tests/modes/01-dummy/reference.log rename to tests/functional/modes/01-dummy/reference.log diff --git a/tests/modes/01-dummy/suite.rc b/tests/functional/modes/01-dummy/suite.rc similarity index 100% rename from tests/modes/01-dummy/suite.rc rename to tests/functional/modes/01-dummy/suite.rc diff --git a/tests/modes/02-dummy-message-outputs.t b/tests/functional/modes/02-dummy-message-outputs.t similarity index 100% rename from tests/modes/02-dummy-message-outputs.t rename to tests/functional/modes/02-dummy-message-outputs.t diff --git a/tests/modes/02-dummy-message-outputs/reference.log b/tests/functional/modes/02-dummy-message-outputs/reference.log similarity index 100% rename from tests/modes/02-dummy-message-outputs/reference.log rename to tests/functional/modes/02-dummy-message-outputs/reference.log diff --git a/tests/modes/02-dummy-message-outputs/suite.rc b/tests/functional/modes/02-dummy-message-outputs/suite.rc similarity index 100% rename from tests/modes/02-dummy-message-outputs/suite.rc rename to tests/functional/modes/02-dummy-message-outputs/suite.rc diff --git a/tests/modes/test_header b/tests/functional/modes/test_header similarity index 100% rename from tests/modes/test_header rename to tests/functional/modes/test_header diff --git a/tests/offset/00-final-simple.t b/tests/functional/offset/00-final-simple.t similarity index 100% rename from tests/offset/00-final-simple.t rename to tests/functional/offset/00-final-simple.t diff --git a/tests/offset/00-final-simple/reference.log b/tests/functional/offset/00-final-simple/reference.log similarity index 100% rename from tests/offset/00-final-simple/reference.log rename to tests/functional/offset/00-final-simple/reference.log diff --git a/tests/offset/00-final-simple/suite.rc b/tests/functional/offset/00-final-simple/suite.rc similarity index 100% rename from tests/offset/00-final-simple/suite.rc rename to tests/functional/offset/00-final-simple/suite.rc diff --git a/tests/offset/01-final-next.t b/tests/functional/offset/01-final-next.t similarity index 100% rename from tests/offset/01-final-next.t rename to tests/functional/offset/01-final-next.t diff --git a/tests/offset/01-final-next/reference.log b/tests/functional/offset/01-final-next/reference.log similarity index 100% rename from tests/offset/01-final-next/reference.log rename to tests/functional/offset/01-final-next/reference.log diff --git a/tests/offset/01-final-next/suite.rc b/tests/functional/offset/01-final-next/suite.rc similarity index 100% rename from tests/offset/01-final-next/suite.rc rename to tests/functional/offset/01-final-next/suite.rc diff --git a/tests/offset/02-final-chain.t b/tests/functional/offset/02-final-chain.t similarity index 100% rename from tests/offset/02-final-chain.t rename to tests/functional/offset/02-final-chain.t diff --git a/tests/offset/02-final-chain/reference.log b/tests/functional/offset/02-final-chain/reference.log similarity index 100% rename from tests/offset/02-final-chain/reference.log rename to tests/functional/offset/02-final-chain/reference.log diff --git a/tests/offset/02-final-chain/suite.rc b/tests/functional/offset/02-final-chain/suite.rc similarity index 100% rename from tests/offset/02-final-chain/suite.rc rename to tests/functional/offset/02-final-chain/suite.rc diff --git a/tests/offset/03-final-next-chain.t b/tests/functional/offset/03-final-next-chain.t similarity index 100% rename from tests/offset/03-final-next-chain.t rename to tests/functional/offset/03-final-next-chain.t diff --git a/tests/offset/03-final-next-chain/reference.log b/tests/functional/offset/03-final-next-chain/reference.log similarity index 100% rename from tests/offset/03-final-next-chain/reference.log rename to tests/functional/offset/03-final-next-chain/reference.log diff --git a/tests/offset/03-final-next-chain/suite.rc b/tests/functional/offset/03-final-next-chain/suite.rc similarity index 100% rename from tests/offset/03-final-next-chain/suite.rc rename to tests/functional/offset/03-final-next-chain/suite.rc diff --git a/tests/offset/04-cycle-offset-chain.t b/tests/functional/offset/04-cycle-offset-chain.t similarity index 100% rename from tests/offset/04-cycle-offset-chain.t rename to tests/functional/offset/04-cycle-offset-chain.t diff --git a/tests/offset/04-cycle-offset-chain/reference.log b/tests/functional/offset/04-cycle-offset-chain/reference.log similarity index 100% rename from tests/offset/04-cycle-offset-chain/reference.log rename to tests/functional/offset/04-cycle-offset-chain/reference.log diff --git a/tests/offset/04-cycle-offset-chain/suite.rc b/tests/functional/offset/04-cycle-offset-chain/suite.rc similarity index 100% rename from tests/offset/04-cycle-offset-chain/suite.rc rename to tests/functional/offset/04-cycle-offset-chain/suite.rc diff --git a/tests/offset/05-long-final-chain.t b/tests/functional/offset/05-long-final-chain.t similarity index 100% rename from tests/offset/05-long-final-chain.t rename to tests/functional/offset/05-long-final-chain.t diff --git a/tests/offset/05-long-final-chain/reference.log b/tests/functional/offset/05-long-final-chain/reference.log similarity index 100% rename from tests/offset/05-long-final-chain/reference.log rename to tests/functional/offset/05-long-final-chain/reference.log diff --git a/tests/offset/05-long-final-chain/suite.rc b/tests/functional/offset/05-long-final-chain/suite.rc similarity index 100% rename from tests/offset/05-long-final-chain/suite.rc rename to tests/functional/offset/05-long-final-chain/suite.rc diff --git a/tests/offset/test_header b/tests/functional/offset/test_header similarity index 100% rename from tests/offset/test_header rename to tests/functional/offset/test_header diff --git a/tests/param_expand/01-basic.t b/tests/functional/param_expand/01-basic.t similarity index 100% rename from tests/param_expand/01-basic.t rename to tests/functional/param_expand/01-basic.t diff --git a/tests/param_expand/01-basic/01.graph.ref b/tests/functional/param_expand/01-basic/01.graph.ref similarity index 100% rename from tests/param_expand/01-basic/01.graph.ref rename to tests/functional/param_expand/01-basic/01.graph.ref diff --git a/tests/param_expand/01-basic/02.graph.ref b/tests/functional/param_expand/01-basic/02.graph.ref similarity index 100% rename from tests/param_expand/01-basic/02.graph.ref rename to tests/functional/param_expand/01-basic/02.graph.ref diff --git a/tests/param_expand/01-basic/03.graph.ref b/tests/functional/param_expand/01-basic/03.graph.ref similarity index 100% rename from tests/param_expand/01-basic/03.graph.ref rename to tests/functional/param_expand/01-basic/03.graph.ref diff --git a/tests/param_expand/01-basic/04.graph.ref b/tests/functional/param_expand/01-basic/04.graph.ref similarity index 100% rename from tests/param_expand/01-basic/04.graph.ref rename to tests/functional/param_expand/01-basic/04.graph.ref diff --git a/tests/param_expand/01-basic/07.graph.ref b/tests/functional/param_expand/01-basic/07.graph.ref similarity index 100% rename from tests/param_expand/01-basic/07.graph.ref rename to tests/functional/param_expand/01-basic/07.graph.ref diff --git a/tests/param_expand/01-basic/11.graph.ref b/tests/functional/param_expand/01-basic/11.graph.ref similarity index 100% rename from tests/param_expand/01-basic/11.graph.ref rename to tests/functional/param_expand/01-basic/11.graph.ref diff --git a/tests/param_expand/01-basic/12.graph.ref b/tests/functional/param_expand/01-basic/12.graph.ref similarity index 100% rename from tests/param_expand/01-basic/12.graph.ref rename to tests/functional/param_expand/01-basic/12.graph.ref diff --git a/tests/param_expand/01-basic/13.graph.ref b/tests/functional/param_expand/01-basic/13.graph.ref similarity index 100% rename from tests/param_expand/01-basic/13.graph.ref rename to tests/functional/param_expand/01-basic/13.graph.ref diff --git a/tests/param_expand/01-basic/14.graph.ref b/tests/functional/param_expand/01-basic/14.graph.ref similarity index 100% rename from tests/param_expand/01-basic/14.graph.ref rename to tests/functional/param_expand/01-basic/14.graph.ref diff --git a/tests/param_expand/01-basic/15.graph.ref b/tests/functional/param_expand/01-basic/15.graph.ref similarity index 100% rename from tests/param_expand/01-basic/15.graph.ref rename to tests/functional/param_expand/01-basic/15.graph.ref diff --git a/tests/param_expand/01-basic/16.graph.ref b/tests/functional/param_expand/01-basic/16.graph.ref similarity index 100% rename from tests/param_expand/01-basic/16.graph.ref rename to tests/functional/param_expand/01-basic/16.graph.ref diff --git a/tests/param_expand/01-basic/17.graph.ref b/tests/functional/param_expand/01-basic/17.graph.ref similarity index 100% rename from tests/param_expand/01-basic/17.graph.ref rename to tests/functional/param_expand/01-basic/17.graph.ref diff --git a/tests/param_expand/01-basic/18.graph.ref b/tests/functional/param_expand/01-basic/18.graph.ref similarity index 100% rename from tests/param_expand/01-basic/18.graph.ref rename to tests/functional/param_expand/01-basic/18.graph.ref diff --git a/tests/param_expand/01-basic/19.graph.ref b/tests/functional/param_expand/01-basic/19.graph.ref similarity index 100% rename from tests/param_expand/01-basic/19.graph.ref rename to tests/functional/param_expand/01-basic/19.graph.ref diff --git a/tests/param_expand/02-param_val.t b/tests/functional/param_expand/02-param_val.t similarity index 100% rename from tests/param_expand/02-param_val.t rename to tests/functional/param_expand/02-param_val.t diff --git a/tests/param_expand/02-param_val/06.graph.ref b/tests/functional/param_expand/02-param_val/06.graph.ref similarity index 100% rename from tests/param_expand/02-param_val/06.graph.ref rename to tests/functional/param_expand/02-param_val/06.graph.ref diff --git a/tests/param_expand/02-param_val/graph-exp-1.ref b/tests/functional/param_expand/02-param_val/graph-exp-1.ref similarity index 100% rename from tests/param_expand/02-param_val/graph-exp-1.ref rename to tests/functional/param_expand/02-param_val/graph-exp-1.ref diff --git a/tests/param_expand/02-param_val/graph-exp-b.ref b/tests/functional/param_expand/02-param_val/graph-exp-b.ref similarity index 100% rename from tests/param_expand/02-param_val/graph-exp-b.ref rename to tests/functional/param_expand/02-param_val/graph-exp-b.ref diff --git a/tests/param_expand/02-param_val/graph-fam-1.ref b/tests/functional/param_expand/02-param_val/graph-fam-1.ref similarity index 100% rename from tests/param_expand/02-param_val/graph-fam-1.ref rename to tests/functional/param_expand/02-param_val/graph-fam-1.ref diff --git a/tests/param_expand/02-param_val/graph-fam-b.ref b/tests/functional/param_expand/02-param_val/graph-fam-b.ref similarity index 100% rename from tests/param_expand/02-param_val/graph-fam-b.ref rename to tests/functional/param_expand/02-param_val/graph-fam-b.ref diff --git a/tests/param_expand/02-param_val/graph-nam-1.ref b/tests/functional/param_expand/02-param_val/graph-nam-1.ref similarity index 100% rename from tests/param_expand/02-param_val/graph-nam-1.ref rename to tests/functional/param_expand/02-param_val/graph-nam-1.ref diff --git a/tests/param_expand/02-param_val/graph-nam-b.ref b/tests/functional/param_expand/02-param_val/graph-nam-b.ref similarity index 100% rename from tests/param_expand/02-param_val/graph-nam-b.ref rename to tests/functional/param_expand/02-param_val/graph-nam-b.ref diff --git a/tests/param_expand/03-env-tmpl.t b/tests/functional/param_expand/03-env-tmpl.t similarity index 100% rename from tests/param_expand/03-env-tmpl.t rename to tests/functional/param_expand/03-env-tmpl.t diff --git a/tests/param_expand/03-env-tmpl/reference.log b/tests/functional/param_expand/03-env-tmpl/reference.log similarity index 100% rename from tests/param_expand/03-env-tmpl/reference.log rename to tests/functional/param_expand/03-env-tmpl/reference.log diff --git a/tests/param_expand/03-env-tmpl/suite.rc b/tests/functional/param_expand/03-env-tmpl/suite.rc similarity index 100% rename from tests/param_expand/03-env-tmpl/suite.rc rename to tests/functional/param_expand/03-env-tmpl/suite.rc diff --git a/tests/param_expand/test_header b/tests/functional/param_expand/test_header similarity index 100% rename from tests/param_expand/test_header rename to tests/functional/param_expand/test_header diff --git a/tests/periodicals/00-daily.t b/tests/functional/periodicals/00-daily.t similarity index 100% rename from tests/periodicals/00-daily.t rename to tests/functional/periodicals/00-daily.t diff --git a/tests/periodicals/01-daily.t b/tests/functional/periodicals/01-daily.t similarity index 100% rename from tests/periodicals/01-daily.t rename to tests/functional/periodicals/01-daily.t diff --git a/tests/periodicals/02-daily.t b/tests/functional/periodicals/02-daily.t similarity index 100% rename from tests/periodicals/02-daily.t rename to tests/functional/periodicals/02-daily.t diff --git a/tests/periodicals/03-monthly.t b/tests/functional/periodicals/03-monthly.t similarity index 100% rename from tests/periodicals/03-monthly.t rename to tests/functional/periodicals/03-monthly.t diff --git a/tests/periodicals/04-monthly.t b/tests/functional/periodicals/04-monthly.t similarity index 100% rename from tests/periodicals/04-monthly.t rename to tests/functional/periodicals/04-monthly.t diff --git a/tests/periodicals/05-monthly.t b/tests/functional/periodicals/05-monthly.t similarity index 100% rename from tests/periodicals/05-monthly.t rename to tests/functional/periodicals/05-monthly.t diff --git a/tests/periodicals/06-yearly.t b/tests/functional/periodicals/06-yearly.t similarity index 100% rename from tests/periodicals/06-yearly.t rename to tests/functional/periodicals/06-yearly.t diff --git a/tests/periodicals/07-yearly.t b/tests/functional/periodicals/07-yearly.t similarity index 100% rename from tests/periodicals/07-yearly.t rename to tests/functional/periodicals/07-yearly.t diff --git a/tests/periodicals/08-yearly.t b/tests/functional/periodicals/08-yearly.t similarity index 100% rename from tests/periodicals/08-yearly.t rename to tests/functional/periodicals/08-yearly.t diff --git a/tests/periodicals/09-monthly-reorder.t b/tests/functional/periodicals/09-monthly-reorder.t similarity index 100% rename from tests/periodicals/09-monthly-reorder.t rename to tests/functional/periodicals/09-monthly-reorder.t diff --git a/tests/periodicals/Daily/reference.log b/tests/functional/periodicals/Daily/reference.log similarity index 100% rename from tests/periodicals/Daily/reference.log rename to tests/functional/periodicals/Daily/reference.log diff --git a/tests/periodicals/Daily/suite.rc b/tests/functional/periodicals/Daily/suite.rc similarity index 100% rename from tests/periodicals/Daily/suite.rc rename to tests/functional/periodicals/Daily/suite.rc diff --git a/tests/periodicals/Monthly-reorder/reference.log b/tests/functional/periodicals/Monthly-reorder/reference.log similarity index 100% rename from tests/periodicals/Monthly-reorder/reference.log rename to tests/functional/periodicals/Monthly-reorder/reference.log diff --git a/tests/periodicals/Monthly-reorder/suite.rc b/tests/functional/periodicals/Monthly-reorder/suite.rc similarity index 100% rename from tests/periodicals/Monthly-reorder/suite.rc rename to tests/functional/periodicals/Monthly-reorder/suite.rc diff --git a/tests/periodicals/Monthly/reference.log b/tests/functional/periodicals/Monthly/reference.log similarity index 100% rename from tests/periodicals/Monthly/reference.log rename to tests/functional/periodicals/Monthly/reference.log diff --git a/tests/periodicals/Monthly/suite.rc b/tests/functional/periodicals/Monthly/suite.rc similarity index 100% rename from tests/periodicals/Monthly/suite.rc rename to tests/functional/periodicals/Monthly/suite.rc diff --git a/tests/periodicals/README b/tests/functional/periodicals/README similarity index 100% rename from tests/periodicals/README rename to tests/functional/periodicals/README diff --git a/tests/periodicals/Yearly/reference.log b/tests/functional/periodicals/Yearly/reference.log similarity index 100% rename from tests/periodicals/Yearly/reference.log rename to tests/functional/periodicals/Yearly/reference.log diff --git a/tests/periodicals/Yearly/suite.rc b/tests/functional/periodicals/Yearly/suite.rc similarity index 100% rename from tests/periodicals/Yearly/suite.rc rename to tests/functional/periodicals/Yearly/suite.rc diff --git a/tests/periodicals/test_header b/tests/functional/periodicals/test_header similarity index 100% rename from tests/periodicals/test_header rename to tests/functional/periodicals/test_header diff --git a/tests/pre-initial/00-simple.t b/tests/functional/pre-initial/00-simple.t similarity index 100% rename from tests/pre-initial/00-simple.t rename to tests/functional/pre-initial/00-simple.t diff --git a/tests/pre-initial/00-simple/reference.log b/tests/functional/pre-initial/00-simple/reference.log similarity index 100% rename from tests/pre-initial/00-simple/reference.log rename to tests/functional/pre-initial/00-simple/reference.log diff --git a/tests/pre-initial/00-simple/suite.rc b/tests/functional/pre-initial/00-simple/suite.rc similarity index 100% rename from tests/pre-initial/00-simple/suite.rc rename to tests/functional/pre-initial/00-simple/suite.rc diff --git a/tests/pre-initial/01-basic.t b/tests/functional/pre-initial/01-basic.t similarity index 100% rename from tests/pre-initial/01-basic.t rename to tests/functional/pre-initial/01-basic.t diff --git a/tests/pre-initial/01-basic/reference.log b/tests/functional/pre-initial/01-basic/reference.log similarity index 100% rename from tests/pre-initial/01-basic/reference.log rename to tests/functional/pre-initial/01-basic/reference.log diff --git a/tests/pre-initial/01-basic/suite.rc b/tests/functional/pre-initial/01-basic/suite.rc similarity index 100% rename from tests/pre-initial/01-basic/suite.rc rename to tests/functional/pre-initial/01-basic/suite.rc diff --git a/tests/pre-initial/02-advanced.t b/tests/functional/pre-initial/02-advanced.t similarity index 100% rename from tests/pre-initial/02-advanced.t rename to tests/functional/pre-initial/02-advanced.t diff --git a/tests/pre-initial/02-advanced/reference.log b/tests/functional/pre-initial/02-advanced/reference.log similarity index 100% rename from tests/pre-initial/02-advanced/reference.log rename to tests/functional/pre-initial/02-advanced/reference.log diff --git a/tests/pre-initial/02-advanced/suite.rc b/tests/functional/pre-initial/02-advanced/suite.rc similarity index 100% rename from tests/pre-initial/02-advanced/suite.rc rename to tests/functional/pre-initial/02-advanced/suite.rc diff --git a/tests/pre-initial/03-drop.t b/tests/functional/pre-initial/03-drop.t similarity index 100% rename from tests/pre-initial/03-drop.t rename to tests/functional/pre-initial/03-drop.t diff --git a/tests/pre-initial/03-drop/reference.log b/tests/functional/pre-initial/03-drop/reference.log similarity index 100% rename from tests/pre-initial/03-drop/reference.log rename to tests/functional/pre-initial/03-drop/reference.log diff --git a/tests/pre-initial/03-drop/suite.rc b/tests/functional/pre-initial/03-drop/suite.rc similarity index 100% rename from tests/pre-initial/03-drop/suite.rc rename to tests/functional/pre-initial/03-drop/suite.rc diff --git a/tests/pre-initial/04-warm.t b/tests/functional/pre-initial/04-warm.t similarity index 100% rename from tests/pre-initial/04-warm.t rename to tests/functional/pre-initial/04-warm.t diff --git a/tests/pre-initial/05-warm-new-ict.t b/tests/functional/pre-initial/05-warm-new-ict.t similarity index 100% rename from tests/pre-initial/05-warm-new-ict.t rename to tests/functional/pre-initial/05-warm-new-ict.t diff --git a/tests/pre-initial/06-over-bracketed.t b/tests/functional/pre-initial/06-over-bracketed.t similarity index 100% rename from tests/pre-initial/06-over-bracketed.t rename to tests/functional/pre-initial/06-over-bracketed.t diff --git a/tests/pre-initial/06-over-bracketed/reference.log b/tests/functional/pre-initial/06-over-bracketed/reference.log similarity index 100% rename from tests/pre-initial/06-over-bracketed/reference.log rename to tests/functional/pre-initial/06-over-bracketed/reference.log diff --git a/tests/pre-initial/06-over-bracketed/suite.rc b/tests/functional/pre-initial/06-over-bracketed/suite.rc similarity index 100% rename from tests/pre-initial/06-over-bracketed/suite.rc rename to tests/functional/pre-initial/06-over-bracketed/suite.rc diff --git a/tests/pre-initial/07-simple-messaging.t b/tests/functional/pre-initial/07-simple-messaging.t similarity index 100% rename from tests/pre-initial/07-simple-messaging.t rename to tests/functional/pre-initial/07-simple-messaging.t diff --git a/tests/pre-initial/07-simple-messaging/reference.log b/tests/functional/pre-initial/07-simple-messaging/reference.log similarity index 100% rename from tests/pre-initial/07-simple-messaging/reference.log rename to tests/functional/pre-initial/07-simple-messaging/reference.log diff --git a/tests/pre-initial/07-simple-messaging/suite.rc b/tests/functional/pre-initial/07-simple-messaging/suite.rc similarity index 100% rename from tests/pre-initial/07-simple-messaging/suite.rc rename to tests/functional/pre-initial/07-simple-messaging/suite.rc diff --git a/tests/pre-initial/08-conditional-messaging.t b/tests/functional/pre-initial/08-conditional-messaging.t similarity index 100% rename from tests/pre-initial/08-conditional-messaging.t rename to tests/functional/pre-initial/08-conditional-messaging.t diff --git a/tests/pre-initial/08-conditional-messaging/reference.log b/tests/functional/pre-initial/08-conditional-messaging/reference.log similarity index 100% rename from tests/pre-initial/08-conditional-messaging/reference.log rename to tests/functional/pre-initial/08-conditional-messaging/reference.log diff --git a/tests/pre-initial/08-conditional-messaging/suite.rc b/tests/functional/pre-initial/08-conditional-messaging/suite.rc similarity index 100% rename from tests/pre-initial/08-conditional-messaging/suite.rc rename to tests/functional/pre-initial/08-conditional-messaging/suite.rc diff --git a/tests/pre-initial/09-warm-iso.t b/tests/functional/pre-initial/09-warm-iso.t similarity index 100% rename from tests/pre-initial/09-warm-iso.t rename to tests/functional/pre-initial/09-warm-iso.t diff --git a/tests/pre-initial/10-warm-insert.t b/tests/functional/pre-initial/10-warm-insert.t similarity index 100% rename from tests/pre-initial/10-warm-insert.t rename to tests/functional/pre-initial/10-warm-insert.t diff --git a/tests/pre-initial/11-warm-insert-stall.t b/tests/functional/pre-initial/11-warm-insert-stall.t similarity index 100% rename from tests/pre-initial/11-warm-insert-stall.t rename to tests/functional/pre-initial/11-warm-insert-stall.t diff --git a/tests/pre-initial/12-warm-restart.t b/tests/functional/pre-initial/12-warm-restart.t similarity index 100% rename from tests/pre-initial/12-warm-restart.t rename to tests/functional/pre-initial/12-warm-restart.t diff --git a/tests/pre-initial/test_header b/tests/functional/pre-initial/test_header similarity index 100% rename from tests/pre-initial/test_header rename to tests/functional/pre-initial/test_header diff --git a/tests/pre-initial/warm-insert-stall/reference.log b/tests/functional/pre-initial/warm-insert-stall/reference.log similarity index 100% rename from tests/pre-initial/warm-insert-stall/reference.log rename to tests/functional/pre-initial/warm-insert-stall/reference.log diff --git a/tests/pre-initial/warm-insert-stall/suite.rc b/tests/functional/pre-initial/warm-insert-stall/suite.rc similarity index 100% rename from tests/pre-initial/warm-insert-stall/suite.rc rename to tests/functional/pre-initial/warm-insert-stall/suite.rc diff --git a/tests/pre-initial/warm-insert/reference.log b/tests/functional/pre-initial/warm-insert/reference.log similarity index 100% rename from tests/pre-initial/warm-insert/reference.log rename to tests/functional/pre-initial/warm-insert/reference.log diff --git a/tests/pre-initial/warm-insert/suite.rc b/tests/functional/pre-initial/warm-insert/suite.rc similarity index 100% rename from tests/pre-initial/warm-insert/suite.rc rename to tests/functional/pre-initial/warm-insert/suite.rc diff --git a/tests/pre-initial/warm-offset/reference.log b/tests/functional/pre-initial/warm-offset/reference.log similarity index 100% rename from tests/pre-initial/warm-offset/reference.log rename to tests/functional/pre-initial/warm-offset/reference.log diff --git a/tests/pre-initial/warm-offset/suite.rc b/tests/functional/pre-initial/warm-offset/suite.rc similarity index 100% rename from tests/pre-initial/warm-offset/suite.rc rename to tests/functional/pre-initial/warm-offset/suite.rc diff --git a/tests/pre-initial/warm-start-iso/reference.log b/tests/functional/pre-initial/warm-start-iso/reference.log similarity index 100% rename from tests/pre-initial/warm-start-iso/reference.log rename to tests/functional/pre-initial/warm-start-iso/reference.log diff --git a/tests/pre-initial/warm-start-iso/suite.rc b/tests/functional/pre-initial/warm-start-iso/suite.rc similarity index 100% rename from tests/pre-initial/warm-start-iso/suite.rc rename to tests/functional/pre-initial/warm-start-iso/suite.rc diff --git a/tests/pre-initial/warm-start/reference.log b/tests/functional/pre-initial/warm-start/reference.log similarity index 100% rename from tests/pre-initial/warm-start/reference.log rename to tests/functional/pre-initial/warm-start/reference.log diff --git a/tests/pre-initial/warm-start/suite.rc b/tests/functional/pre-initial/warm-start/suite.rc similarity index 100% rename from tests/pre-initial/warm-start/suite.rc rename to tests/functional/pre-initial/warm-start/suite.rc diff --git a/tests/queues/00-queuesize-3.t b/tests/functional/queues/00-queuesize-3.t similarity index 100% rename from tests/queues/00-queuesize-3.t rename to tests/functional/queues/00-queuesize-3.t diff --git a/tests/queues/01-queuesize-5.t b/tests/functional/queues/01-queuesize-5.t similarity index 100% rename from tests/queues/01-queuesize-5.t rename to tests/functional/queues/01-queuesize-5.t diff --git a/tests/queues/02-queueorder.t b/tests/functional/queues/02-queueorder.t similarity index 100% rename from tests/queues/02-queueorder.t rename to tests/functional/queues/02-queueorder.t diff --git a/tests/queues/02-queueorder/reference.log b/tests/functional/queues/02-queueorder/reference.log similarity index 100% rename from tests/queues/02-queueorder/reference.log rename to tests/functional/queues/02-queueorder/reference.log diff --git a/tests/queues/02-queueorder/suite.rc b/tests/functional/queues/02-queueorder/suite.rc similarity index 100% rename from tests/queues/02-queueorder/suite.rc rename to tests/functional/queues/02-queueorder/suite.rc diff --git a/tests/queues/qsize/reference.log b/tests/functional/queues/qsize/reference.log similarity index 100% rename from tests/queues/qsize/reference.log rename to tests/functional/queues/qsize/reference.log diff --git a/tests/queues/qsize/suite.rc b/tests/functional/queues/qsize/suite.rc similarity index 100% rename from tests/queues/qsize/suite.rc rename to tests/functional/queues/qsize/suite.rc diff --git a/tests/queues/test_header b/tests/functional/queues/test_header similarity index 100% rename from tests/queues/test_header rename to tests/functional/queues/test_header diff --git a/tests/recurrence-min/00-basic.t b/tests/functional/recurrence-min/00-basic.t similarity index 100% rename from tests/recurrence-min/00-basic.t rename to tests/functional/recurrence-min/00-basic.t diff --git a/tests/recurrence-min/00-basic/reference.log b/tests/functional/recurrence-min/00-basic/reference.log similarity index 100% rename from tests/recurrence-min/00-basic/reference.log rename to tests/functional/recurrence-min/00-basic/reference.log diff --git a/tests/recurrence-min/00-basic/suite.rc b/tests/functional/recurrence-min/00-basic/suite.rc similarity index 100% rename from tests/recurrence-min/00-basic/suite.rc rename to tests/functional/recurrence-min/00-basic/suite.rc diff --git a/tests/recurrence-min/01-offset-initial.t b/tests/functional/recurrence-min/01-offset-initial.t similarity index 100% rename from tests/recurrence-min/01-offset-initial.t rename to tests/functional/recurrence-min/01-offset-initial.t diff --git a/tests/recurrence-min/01-offset-initial/reference.log b/tests/functional/recurrence-min/01-offset-initial/reference.log similarity index 100% rename from tests/recurrence-min/01-offset-initial/reference.log rename to tests/functional/recurrence-min/01-offset-initial/reference.log diff --git a/tests/recurrence-min/01-offset-initial/suite.rc b/tests/functional/recurrence-min/01-offset-initial/suite.rc similarity index 100% rename from tests/recurrence-min/01-offset-initial/suite.rc rename to tests/functional/recurrence-min/01-offset-initial/suite.rc diff --git a/tests/recurrence-min/02-offset-truncated.t b/tests/functional/recurrence-min/02-offset-truncated.t similarity index 100% rename from tests/recurrence-min/02-offset-truncated.t rename to tests/functional/recurrence-min/02-offset-truncated.t diff --git a/tests/recurrence-min/02-offset-truncated/reference.log b/tests/functional/recurrence-min/02-offset-truncated/reference.log similarity index 100% rename from tests/recurrence-min/02-offset-truncated/reference.log rename to tests/functional/recurrence-min/02-offset-truncated/reference.log diff --git a/tests/recurrence-min/02-offset-truncated/suite.rc b/tests/functional/recurrence-min/02-offset-truncated/suite.rc similarity index 100% rename from tests/recurrence-min/02-offset-truncated/suite.rc rename to tests/functional/recurrence-min/02-offset-truncated/suite.rc diff --git a/tests/recurrence-min/03-neg-offset-truncated.t b/tests/functional/recurrence-min/03-neg-offset-truncated.t similarity index 100% rename from tests/recurrence-min/03-neg-offset-truncated.t rename to tests/functional/recurrence-min/03-neg-offset-truncated.t diff --git a/tests/recurrence-min/03-neg-offset-truncated/reference.log b/tests/functional/recurrence-min/03-neg-offset-truncated/reference.log similarity index 100% rename from tests/recurrence-min/03-neg-offset-truncated/reference.log rename to tests/functional/recurrence-min/03-neg-offset-truncated/reference.log diff --git a/tests/recurrence-min/03-neg-offset-truncated/suite.rc b/tests/functional/recurrence-min/03-neg-offset-truncated/suite.rc similarity index 100% rename from tests/recurrence-min/03-neg-offset-truncated/suite.rc rename to tests/functional/recurrence-min/03-neg-offset-truncated/suite.rc diff --git a/tests/recurrence-min/test_header b/tests/functional/recurrence-min/test_header similarity index 100% rename from tests/recurrence-min/test_header rename to tests/functional/recurrence-min/test_header diff --git a/tests/registration/00-simple.t b/tests/functional/registration/00-simple.t similarity index 100% rename from tests/registration/00-simple.t rename to tests/functional/registration/00-simple.t diff --git a/tests/registration/01-no-skip1.t b/tests/functional/registration/01-no-skip1.t similarity index 100% rename from tests/registration/01-no-skip1.t rename to tests/functional/registration/01-no-skip1.t diff --git a/tests/registration/test_header b/tests/functional/registration/test_header similarity index 100% rename from tests/registration/test_header rename to tests/functional/registration/test_header diff --git a/tests/reload/00-simple.t b/tests/functional/reload/00-simple.t similarity index 100% rename from tests/reload/00-simple.t rename to tests/functional/reload/00-simple.t diff --git a/tests/reload/00-simple/reference.log b/tests/functional/reload/00-simple/reference.log similarity index 100% rename from tests/reload/00-simple/reference.log rename to tests/functional/reload/00-simple/reference.log diff --git a/tests/reload/00-simple/suite.rc b/tests/functional/reload/00-simple/suite.rc similarity index 100% rename from tests/reload/00-simple/suite.rc rename to tests/functional/reload/00-simple/suite.rc diff --git a/tests/reload/01-startup.t b/tests/functional/reload/01-startup.t similarity index 100% rename from tests/reload/01-startup.t rename to tests/functional/reload/01-startup.t diff --git a/tests/reload/01-startup/reference.log b/tests/functional/reload/01-startup/reference.log similarity index 100% rename from tests/reload/01-startup/reference.log rename to tests/functional/reload/01-startup/reference.log diff --git a/tests/reload/01-startup/suite.rc b/tests/functional/reload/01-startup/suite.rc similarity index 100% rename from tests/reload/01-startup/suite.rc rename to tests/functional/reload/01-startup/suite.rc diff --git a/tests/reload/02-content.t b/tests/functional/reload/02-content.t similarity index 100% rename from tests/reload/02-content.t rename to tests/functional/reload/02-content.t diff --git a/tests/reload/02-content/reference.log b/tests/functional/reload/02-content/reference.log similarity index 100% rename from tests/reload/02-content/reference.log rename to tests/functional/reload/02-content/reference.log diff --git a/tests/reload/02-content/suite.rc b/tests/functional/reload/02-content/suite.rc similarity index 100% rename from tests/reload/02-content/suite.rc rename to tests/functional/reload/02-content/suite.rc diff --git a/tests/reload/03-queues.t b/tests/functional/reload/03-queues.t similarity index 100% rename from tests/reload/03-queues.t rename to tests/functional/reload/03-queues.t diff --git a/tests/reload/03-queues/reference.log b/tests/functional/reload/03-queues/reference.log similarity index 100% rename from tests/reload/03-queues/reference.log rename to tests/functional/reload/03-queues/reference.log diff --git a/tests/reload/03-queues/suite.rc b/tests/functional/reload/03-queues/suite.rc similarity index 100% rename from tests/reload/03-queues/suite.rc rename to tests/functional/reload/03-queues/suite.rc diff --git a/tests/reload/04-inheritance.t b/tests/functional/reload/04-inheritance.t similarity index 100% rename from tests/reload/04-inheritance.t rename to tests/functional/reload/04-inheritance.t diff --git a/tests/reload/04-inheritance/reference.log b/tests/functional/reload/04-inheritance/reference.log similarity index 100% rename from tests/reload/04-inheritance/reference.log rename to tests/functional/reload/04-inheritance/reference.log diff --git a/tests/reload/04-inheritance/suite.rc b/tests/functional/reload/04-inheritance/suite.rc similarity index 100% rename from tests/reload/04-inheritance/suite.rc rename to tests/functional/reload/04-inheritance/suite.rc diff --git a/tests/reload/05-graphing-simple.t b/tests/functional/reload/05-graphing-simple.t similarity index 100% rename from tests/reload/05-graphing-simple.t rename to tests/functional/reload/05-graphing-simple.t diff --git a/tests/reload/05-graphing-simple/reference.log b/tests/functional/reload/05-graphing-simple/reference.log similarity index 100% rename from tests/reload/05-graphing-simple/reference.log rename to tests/functional/reload/05-graphing-simple/reference.log diff --git a/tests/reload/05-graphing-simple/suite.rc b/tests/functional/reload/05-graphing-simple/suite.rc similarity index 100% rename from tests/reload/05-graphing-simple/suite.rc rename to tests/functional/reload/05-graphing-simple/suite.rc diff --git a/tests/reload/06-graphing-fam.t b/tests/functional/reload/06-graphing-fam.t similarity index 100% rename from tests/reload/06-graphing-fam.t rename to tests/functional/reload/06-graphing-fam.t diff --git a/tests/reload/06-graphing-fam/reference.log b/tests/functional/reload/06-graphing-fam/reference.log similarity index 100% rename from tests/reload/06-graphing-fam/reference.log rename to tests/functional/reload/06-graphing-fam/reference.log diff --git a/tests/reload/06-graphing-fam/suite.rc b/tests/functional/reload/06-graphing-fam/suite.rc similarity index 100% rename from tests/reload/06-graphing-fam/suite.rc rename to tests/functional/reload/06-graphing-fam/suite.rc diff --git a/tests/reload/07-final-cycle.t b/tests/functional/reload/07-final-cycle.t similarity index 100% rename from tests/reload/07-final-cycle.t rename to tests/functional/reload/07-final-cycle.t diff --git a/tests/reload/07-final-cycle/reference.log b/tests/functional/reload/07-final-cycle/reference.log similarity index 100% rename from tests/reload/07-final-cycle/reference.log rename to tests/functional/reload/07-final-cycle/reference.log diff --git a/tests/reload/07-final-cycle/suite.rc b/tests/functional/reload/07-final-cycle/suite.rc similarity index 100% rename from tests/reload/07-final-cycle/suite.rc rename to tests/functional/reload/07-final-cycle/suite.rc diff --git a/tests/reload/08-cycle.t b/tests/functional/reload/08-cycle.t similarity index 100% rename from tests/reload/08-cycle.t rename to tests/functional/reload/08-cycle.t diff --git a/tests/reload/08-cycle/reference.log b/tests/functional/reload/08-cycle/reference.log similarity index 100% rename from tests/reload/08-cycle/reference.log rename to tests/functional/reload/08-cycle/reference.log diff --git a/tests/reload/08-cycle/suite.rc b/tests/functional/reload/08-cycle/suite.rc similarity index 100% rename from tests/reload/08-cycle/suite.rc rename to tests/functional/reload/08-cycle/suite.rc diff --git a/tests/reload/09-garbage.t b/tests/functional/reload/09-garbage.t similarity index 100% rename from tests/reload/09-garbage.t rename to tests/functional/reload/09-garbage.t diff --git a/tests/reload/10-runahead.t b/tests/functional/reload/10-runahead.t similarity index 100% rename from tests/reload/10-runahead.t rename to tests/functional/reload/10-runahead.t diff --git a/tests/reload/11-retrying.t b/tests/functional/reload/11-retrying.t similarity index 100% rename from tests/reload/11-retrying.t rename to tests/functional/reload/11-retrying.t diff --git a/tests/reload/11-retrying/reference.log b/tests/functional/reload/11-retrying/reference.log similarity index 100% rename from tests/reload/11-retrying/reference.log rename to tests/functional/reload/11-retrying/reference.log diff --git a/tests/reload/11-retrying/suite.rc b/tests/functional/reload/11-retrying/suite.rc similarity index 100% rename from tests/reload/11-retrying/suite.rc rename to tests/functional/reload/11-retrying/suite.rc diff --git a/tests/reload/12-remove-task.t b/tests/functional/reload/12-remove-task.t similarity index 100% rename from tests/reload/12-remove-task.t rename to tests/functional/reload/12-remove-task.t diff --git a/tests/reload/12-remove-task/reference.log b/tests/functional/reload/12-remove-task/reference.log similarity index 100% rename from tests/reload/12-remove-task/reference.log rename to tests/functional/reload/12-remove-task/reference.log diff --git a/tests/reload/12-remove-task/suite.rc b/tests/functional/reload/12-remove-task/suite.rc similarity index 100% rename from tests/reload/12-remove-task/suite.rc rename to tests/functional/reload/12-remove-task/suite.rc diff --git a/tests/reload/13-add-task.t b/tests/functional/reload/13-add-task.t similarity index 100% rename from tests/reload/13-add-task.t rename to tests/functional/reload/13-add-task.t diff --git a/tests/reload/13-add-task/reference.log b/tests/functional/reload/13-add-task/reference.log similarity index 100% rename from tests/reload/13-add-task/reference.log rename to tests/functional/reload/13-add-task/reference.log diff --git a/tests/reload/13-add-task/suite.rc b/tests/functional/reload/13-add-task/suite.rc similarity index 100% rename from tests/reload/13-add-task/suite.rc rename to tests/functional/reload/13-add-task/suite.rc diff --git a/tests/reload/14-waiting.t b/tests/functional/reload/14-waiting.t similarity index 100% rename from tests/reload/14-waiting.t rename to tests/functional/reload/14-waiting.t diff --git a/tests/reload/14-waiting/reference.log b/tests/functional/reload/14-waiting/reference.log similarity index 100% rename from tests/reload/14-waiting/reference.log rename to tests/functional/reload/14-waiting/reference.log diff --git a/tests/reload/14-waiting/suite.rc b/tests/functional/reload/14-waiting/suite.rc similarity index 100% rename from tests/reload/14-waiting/suite.rc rename to tests/functional/reload/14-waiting/suite.rc diff --git a/tests/reload/15-state-summary.t b/tests/functional/reload/15-state-summary.t similarity index 100% rename from tests/reload/15-state-summary.t rename to tests/functional/reload/15-state-summary.t diff --git a/tests/reload/15-state-summary/suite.rc b/tests/functional/reload/15-state-summary/suite.rc similarity index 100% rename from tests/reload/15-state-summary/suite.rc rename to tests/functional/reload/15-state-summary/suite.rc diff --git a/tests/reload/16-remove-add-alter-task.t b/tests/functional/reload/16-remove-add-alter-task.t similarity index 100% rename from tests/reload/16-remove-add-alter-task.t rename to tests/functional/reload/16-remove-add-alter-task.t diff --git a/tests/reload/16-remove-add-alter-task/reference.log b/tests/functional/reload/16-remove-add-alter-task/reference.log similarity index 100% rename from tests/reload/16-remove-add-alter-task/reference.log rename to tests/functional/reload/16-remove-add-alter-task/reference.log diff --git a/tests/reload/16-remove-add-alter-task/suite.rc b/tests/functional/reload/16-remove-add-alter-task/suite.rc similarity index 100% rename from tests/reload/16-remove-add-alter-task/suite.rc rename to tests/functional/reload/16-remove-add-alter-task/suite.rc diff --git a/tests/reload/17-graphing-change.t b/tests/functional/reload/17-graphing-change.t similarity index 100% rename from tests/reload/17-graphing-change.t rename to tests/functional/reload/17-graphing-change.t diff --git a/tests/reload/18-broadcast-insert.t b/tests/functional/reload/18-broadcast-insert.t similarity index 100% rename from tests/reload/18-broadcast-insert.t rename to tests/functional/reload/18-broadcast-insert.t diff --git a/tests/reload/18-broadcast-insert/reference.log b/tests/functional/reload/18-broadcast-insert/reference.log similarity index 100% rename from tests/reload/18-broadcast-insert/reference.log rename to tests/functional/reload/18-broadcast-insert/reference.log diff --git a/tests/reload/18-broadcast-insert/suite-2.rc b/tests/functional/reload/18-broadcast-insert/suite-2.rc similarity index 100% rename from tests/reload/18-broadcast-insert/suite-2.rc rename to tests/functional/reload/18-broadcast-insert/suite-2.rc diff --git a/tests/reload/18-broadcast-insert/suite.rc b/tests/functional/reload/18-broadcast-insert/suite.rc similarity index 100% rename from tests/reload/18-broadcast-insert/suite.rc rename to tests/functional/reload/18-broadcast-insert/suite.rc diff --git a/tests/reload/19-remote-kill.t b/tests/functional/reload/19-remote-kill.t similarity index 100% rename from tests/reload/19-remote-kill.t rename to tests/functional/reload/19-remote-kill.t diff --git a/tests/reload/19-remote-kill/reference.log b/tests/functional/reload/19-remote-kill/reference.log similarity index 100% rename from tests/reload/19-remote-kill/reference.log rename to tests/functional/reload/19-remote-kill/reference.log diff --git a/tests/reload/19-remote-kill/suite.rc b/tests/functional/reload/19-remote-kill/suite.rc similarity index 100% rename from tests/reload/19-remote-kill/suite.rc rename to tests/functional/reload/19-remote-kill/suite.rc diff --git a/tests/reload/20-stop-point.t b/tests/functional/reload/20-stop-point.t similarity index 100% rename from tests/reload/20-stop-point.t rename to tests/functional/reload/20-stop-point.t diff --git a/tests/reload/20-stop-point/reference.log b/tests/functional/reload/20-stop-point/reference.log similarity index 100% rename from tests/reload/20-stop-point/reference.log rename to tests/functional/reload/20-stop-point/reference.log diff --git a/tests/reload/20-stop-point/suite.rc b/tests/functional/reload/20-stop-point/suite.rc similarity index 100% rename from tests/reload/20-stop-point/suite.rc rename to tests/functional/reload/20-stop-point/suite.rc diff --git a/tests/reload/21-submit-fail.t b/tests/functional/reload/21-submit-fail.t similarity index 100% rename from tests/reload/21-submit-fail.t rename to tests/functional/reload/21-submit-fail.t diff --git a/tests/reload/21-submit-fail/bin/mycylcrun b/tests/functional/reload/21-submit-fail/bin/mycylcrun similarity index 100% rename from tests/reload/21-submit-fail/bin/mycylcrun rename to tests/functional/reload/21-submit-fail/bin/mycylcrun diff --git a/tests/reload/21-submit-fail/reference.log b/tests/functional/reload/21-submit-fail/reference.log similarity index 100% rename from tests/reload/21-submit-fail/reference.log rename to tests/functional/reload/21-submit-fail/reference.log diff --git a/tests/reload/21-submit-fail/suite.rc b/tests/functional/reload/21-submit-fail/suite.rc similarity index 100% rename from tests/reload/21-submit-fail/suite.rc rename to tests/functional/reload/21-submit-fail/suite.rc diff --git a/tests/reload/22-remove-task-cycling.t b/tests/functional/reload/22-remove-task-cycling.t similarity index 100% rename from tests/reload/22-remove-task-cycling.t rename to tests/functional/reload/22-remove-task-cycling.t diff --git a/tests/reload/garbage/reference.log b/tests/functional/reload/garbage/reference.log similarity index 100% rename from tests/reload/garbage/reference.log rename to tests/functional/reload/garbage/reference.log diff --git a/tests/reload/garbage/suite.rc b/tests/functional/reload/garbage/suite.rc similarity index 100% rename from tests/reload/garbage/suite.rc rename to tests/functional/reload/garbage/suite.rc diff --git a/tests/reload/graphing-change/suite-1.rc b/tests/functional/reload/graphing-change/suite-1.rc similarity index 100% rename from tests/reload/graphing-change/suite-1.rc rename to tests/functional/reload/graphing-change/suite-1.rc diff --git a/tests/reload/graphing-change/suite-2.rc b/tests/functional/reload/graphing-change/suite-2.rc similarity index 100% rename from tests/reload/graphing-change/suite-2.rc rename to tests/functional/reload/graphing-change/suite-2.rc diff --git a/tests/reload/graphing-change/suite.rc b/tests/functional/reload/graphing-change/suite.rc similarity index 100% rename from tests/reload/graphing-change/suite.rc rename to tests/functional/reload/graphing-change/suite.rc diff --git a/tests/reload/runahead/suite.rc b/tests/functional/reload/runahead/suite.rc similarity index 100% rename from tests/reload/runahead/suite.rc rename to tests/functional/reload/runahead/suite.rc diff --git a/tests/reload/test_header b/tests/functional/reload/test_header similarity index 100% rename from tests/reload/test_header rename to tests/functional/reload/test_header diff --git a/tests/remote/00-basic.t b/tests/functional/remote/00-basic.t similarity index 100% rename from tests/remote/00-basic.t rename to tests/functional/remote/00-basic.t diff --git a/tests/remote/basic/reference.log b/tests/functional/remote/basic/reference.log similarity index 100% rename from tests/remote/basic/reference.log rename to tests/functional/remote/basic/reference.log diff --git a/tests/remote/basic/suite.rc b/tests/functional/remote/basic/suite.rc similarity index 100% rename from tests/remote/basic/suite.rc rename to tests/functional/remote/basic/suite.rc diff --git a/tests/remote/test_header b/tests/functional/remote/test_header similarity index 100% rename from tests/remote/test_header rename to tests/functional/remote/test_header diff --git a/tests/repeated-items/00-one.t b/tests/functional/repeated-items/00-one.t similarity index 100% rename from tests/repeated-items/00-one.t rename to tests/functional/repeated-items/00-one.t diff --git a/tests/repeated-items/one/suite.rc b/tests/functional/repeated-items/one/suite.rc similarity index 100% rename from tests/repeated-items/one/suite.rc rename to tests/functional/repeated-items/one/suite.rc diff --git a/tests/repeated-items/test_header b/tests/functional/repeated-items/test_header similarity index 100% rename from tests/repeated-items/test_header rename to tests/functional/repeated-items/test_header diff --git a/tests/restart/00-pre-initial.t b/tests/functional/restart/00-pre-initial.t similarity index 100% rename from tests/restart/00-pre-initial.t rename to tests/functional/restart/00-pre-initial.t diff --git a/tests/restart/00-pre-initial/ref-state b/tests/functional/restart/00-pre-initial/ref-state similarity index 100% rename from tests/restart/00-pre-initial/ref-state rename to tests/functional/restart/00-pre-initial/ref-state diff --git a/tests/restart/00-pre-initial/suite.rc b/tests/functional/restart/00-pre-initial/suite.rc similarity index 100% rename from tests/restart/00-pre-initial/suite.rc rename to tests/functional/restart/00-pre-initial/suite.rc diff --git a/tests/restart/01-broadcast.t b/tests/functional/restart/01-broadcast.t similarity index 100% rename from tests/restart/01-broadcast.t rename to tests/functional/restart/01-broadcast.t diff --git a/tests/restart/02-failed.t b/tests/functional/restart/02-failed.t similarity index 100% rename from tests/restart/02-failed.t rename to tests/functional/restart/02-failed.t diff --git a/tests/restart/03-retrying.t b/tests/functional/restart/03-retrying.t similarity index 100% rename from tests/restart/03-retrying.t rename to tests/functional/restart/03-retrying.t diff --git a/tests/restart/04-running.t b/tests/functional/restart/04-running.t similarity index 100% rename from tests/restart/04-running.t rename to tests/functional/restart/04-running.t diff --git a/tests/restart/05-submit-failed.t b/tests/functional/restart/05-submit-failed.t similarity index 100% rename from tests/restart/05-submit-failed.t rename to tests/functional/restart/05-submit-failed.t diff --git a/tests/restart/06-succeeded.t b/tests/functional/restart/06-succeeded.t similarity index 100% rename from tests/restart/06-succeeded.t rename to tests/functional/restart/06-succeeded.t diff --git a/tests/restart/07-waiting.t b/tests/functional/restart/07-waiting.t similarity index 100% rename from tests/restart/07-waiting.t rename to tests/functional/restart/07-waiting.t diff --git a/tests/restart/09-reload.t b/tests/functional/restart/09-reload.t similarity index 100% rename from tests/restart/09-reload.t rename to tests/functional/restart/09-reload.t diff --git a/tests/restart/10-pre-initial-2.t b/tests/functional/restart/10-pre-initial-2.t similarity index 100% rename from tests/restart/10-pre-initial-2.t rename to tests/functional/restart/10-pre-initial-2.t diff --git a/tests/restart/12-deleted-logs.t b/tests/functional/restart/12-deleted-logs.t similarity index 100% rename from tests/restart/12-deleted-logs.t rename to tests/functional/restart/12-deleted-logs.t diff --git a/tests/restart/13-bad-job-host.t b/tests/functional/restart/13-bad-job-host.t similarity index 100% rename from tests/restart/13-bad-job-host.t rename to tests/functional/restart/13-bad-job-host.t diff --git a/tests/restart/16-template-vars.t b/tests/functional/restart/16-template-vars.t similarity index 100% rename from tests/restart/16-template-vars.t rename to tests/functional/restart/16-template-vars.t diff --git a/tests/restart/16-template-vars/reference.log b/tests/functional/restart/16-template-vars/reference.log similarity index 100% rename from tests/restart/16-template-vars/reference.log rename to tests/functional/restart/16-template-vars/reference.log diff --git a/tests/restart/16-template-vars/suite.rc b/tests/functional/restart/16-template-vars/suite.rc similarity index 100% rename from tests/restart/16-template-vars/suite.rc rename to tests/functional/restart/16-template-vars/suite.rc diff --git a/tests/restart/17-template-vars-file b/tests/functional/restart/17-template-vars-file similarity index 100% rename from tests/restart/17-template-vars-file rename to tests/functional/restart/17-template-vars-file diff --git a/tests/restart/17-template-vars-file.t b/tests/functional/restart/17-template-vars-file.t similarity index 100% rename from tests/restart/17-template-vars-file.t rename to tests/functional/restart/17-template-vars-file.t diff --git a/tests/restart/18-template-vars-override.t b/tests/functional/restart/18-template-vars-override.t similarity index 100% rename from tests/restart/18-template-vars-override.t rename to tests/functional/restart/18-template-vars-override.t diff --git a/tests/restart/18-template-vars-override/reference.log b/tests/functional/restart/18-template-vars-override/reference.log similarity index 100% rename from tests/restart/18-template-vars-override/reference.log rename to tests/functional/restart/18-template-vars-override/reference.log diff --git a/tests/restart/18-template-vars-override/suite.rc b/tests/functional/restart/18-template-vars-override/suite.rc similarity index 100% rename from tests/restart/18-template-vars-override/suite.rc rename to tests/functional/restart/18-template-vars-override/suite.rc diff --git a/tests/restart/20-event-retry.t b/tests/functional/restart/20-event-retry.t similarity index 100% rename from tests/restart/20-event-retry.t rename to tests/functional/restart/20-event-retry.t diff --git a/tests/restart/20-event-retry/bin/my-handler b/tests/functional/restart/20-event-retry/bin/my-handler similarity index 100% rename from tests/restart/20-event-retry/bin/my-handler rename to tests/functional/restart/20-event-retry/bin/my-handler diff --git a/tests/restart/20-event-retry/suite.rc b/tests/functional/restart/20-event-retry/suite.rc similarity index 100% rename from tests/restart/20-event-retry/suite.rc rename to tests/functional/restart/20-event-retry/suite.rc diff --git a/tests/restart/22-hold.t b/tests/functional/restart/22-hold.t similarity index 100% rename from tests/restart/22-hold.t rename to tests/functional/restart/22-hold.t diff --git a/tests/restart/22-hold/suite.rc b/tests/functional/restart/22-hold/suite.rc similarity index 100% rename from tests/restart/22-hold/suite.rc rename to tests/functional/restart/22-hold/suite.rc diff --git a/tests/restart/23-hold-retry.t b/tests/functional/restart/23-hold-retry.t similarity index 100% rename from tests/restart/23-hold-retry.t rename to tests/functional/restart/23-hold-retry.t diff --git a/tests/restart/23-hold-retry/suite.rc b/tests/functional/restart/23-hold-retry/suite.rc similarity index 100% rename from tests/restart/23-hold-retry/suite.rc rename to tests/functional/restart/23-hold-retry/suite.rc diff --git a/tests/restart/25-hold-suite.t b/tests/functional/restart/25-hold-suite.t similarity index 100% rename from tests/restart/25-hold-suite.t rename to tests/functional/restart/25-hold-suite.t diff --git a/tests/restart/25-hold-suite/suite.rc b/tests/functional/restart/25-hold-suite/suite.rc similarity index 100% rename from tests/restart/25-hold-suite/suite.rc rename to tests/functional/restart/25-hold-suite/suite.rc diff --git a/tests/restart/26-remote-kill.t b/tests/functional/restart/26-remote-kill.t similarity index 100% rename from tests/restart/26-remote-kill.t rename to tests/functional/restart/26-remote-kill.t diff --git a/tests/restart/26-remote-kill/suite.rc b/tests/functional/restart/26-remote-kill/suite.rc similarity index 100% rename from tests/restart/26-remote-kill/suite.rc rename to tests/functional/restart/26-remote-kill/suite.rc diff --git a/tests/restart/27-broadcast-timeout.t b/tests/functional/restart/27-broadcast-timeout.t similarity index 100% rename from tests/restart/27-broadcast-timeout.t rename to tests/functional/restart/27-broadcast-timeout.t diff --git a/tests/restart/27-broadcast-timeout/reference.log b/tests/functional/restart/27-broadcast-timeout/reference.log similarity index 100% rename from tests/restart/27-broadcast-timeout/reference.log rename to tests/functional/restart/27-broadcast-timeout/reference.log diff --git a/tests/restart/27-broadcast-timeout/suite.rc b/tests/functional/restart/27-broadcast-timeout/suite.rc similarity index 100% rename from tests/restart/27-broadcast-timeout/suite.rc rename to tests/functional/restart/27-broadcast-timeout/suite.rc diff --git a/tests/restart/28-execution-timeout.t b/tests/functional/restart/28-execution-timeout.t similarity index 100% rename from tests/restart/28-execution-timeout.t rename to tests/functional/restart/28-execution-timeout.t diff --git a/tests/restart/28-execution-timeout/reference.log b/tests/functional/restart/28-execution-timeout/reference.log similarity index 100% rename from tests/restart/28-execution-timeout/reference.log rename to tests/functional/restart/28-execution-timeout/reference.log diff --git a/tests/restart/28-execution-timeout/suite.rc b/tests/functional/restart/28-execution-timeout/suite.rc similarity index 100% rename from tests/restart/28-execution-timeout/suite.rc rename to tests/functional/restart/28-execution-timeout/suite.rc diff --git a/tests/restart/30-outputs.t b/tests/functional/restart/30-outputs.t similarity index 100% rename from tests/restart/30-outputs.t rename to tests/functional/restart/30-outputs.t diff --git a/tests/restart/30-outputs/reference.log b/tests/functional/restart/30-outputs/reference.log similarity index 100% rename from tests/restart/30-outputs/reference.log rename to tests/functional/restart/30-outputs/reference.log diff --git a/tests/restart/30-outputs/suite.rc b/tests/functional/restart/30-outputs/suite.rc similarity index 100% rename from tests/restart/30-outputs/suite.rc rename to tests/functional/restart/30-outputs/suite.rc diff --git a/tests/restart/32-reload-runahead-no-stop-point.t b/tests/functional/restart/32-reload-runahead-no-stop-point.t similarity index 100% rename from tests/restart/32-reload-runahead-no-stop-point.t rename to tests/functional/restart/32-reload-runahead-no-stop-point.t diff --git a/tests/restart/32-reload-runahead-no-stop-point/reference.log b/tests/functional/restart/32-reload-runahead-no-stop-point/reference.log similarity index 100% rename from tests/restart/32-reload-runahead-no-stop-point/reference.log rename to tests/functional/restart/32-reload-runahead-no-stop-point/reference.log diff --git a/tests/restart/32-reload-runahead-no-stop-point/suite.rc b/tests/functional/restart/32-reload-runahead-no-stop-point/suite.rc similarity index 100% rename from tests/restart/32-reload-runahead-no-stop-point/suite.rc rename to tests/functional/restart/32-reload-runahead-no-stop-point/suite.rc diff --git a/tests/restart/33-simulation.t b/tests/functional/restart/33-simulation.t similarity index 100% rename from tests/restart/33-simulation.t rename to tests/functional/restart/33-simulation.t diff --git a/tests/restart/34-auto-restart-basic.t b/tests/functional/restart/34-auto-restart-basic.t similarity index 100% rename from tests/restart/34-auto-restart-basic.t rename to tests/functional/restart/34-auto-restart-basic.t diff --git a/tests/restart/35-auto-restart-recovery.t b/tests/functional/restart/35-auto-restart-recovery.t similarity index 100% rename from tests/restart/35-auto-restart-recovery.t rename to tests/functional/restart/35-auto-restart-recovery.t diff --git a/tests/restart/37-auto-restart-delay.t b/tests/functional/restart/37-auto-restart-delay.t similarity index 100% rename from tests/restart/37-auto-restart-delay.t rename to tests/functional/restart/37-auto-restart-delay.t diff --git a/tests/restart/38-auto-restart-stopping.t b/tests/functional/restart/38-auto-restart-stopping.t similarity index 100% rename from tests/restart/38-auto-restart-stopping.t rename to tests/functional/restart/38-auto-restart-stopping.t diff --git a/tests/restart/41-auto-restart-local-jobs.t b/tests/functional/restart/41-auto-restart-local-jobs.t similarity index 100% rename from tests/restart/41-auto-restart-local-jobs.t rename to tests/functional/restart/41-auto-restart-local-jobs.t diff --git a/tests/restart/42-auto-restart-ping-pong.t b/tests/functional/restart/42-auto-restart-ping-pong.t similarity index 100% rename from tests/restart/42-auto-restart-ping-pong.t rename to tests/functional/restart/42-auto-restart-ping-pong.t diff --git a/tests/restart/43-auto-restart-force-override-normal.t b/tests/functional/restart/43-auto-restart-force-override-normal.t similarity index 100% rename from tests/restart/43-auto-restart-force-override-normal.t rename to tests/functional/restart/43-auto-restart-force-override-normal.t diff --git a/tests/restart/44-stop-point.t b/tests/functional/restart/44-stop-point.t similarity index 100% rename from tests/restart/44-stop-point.t rename to tests/functional/restart/44-stop-point.t diff --git a/tests/restart/45-stop-task.t b/tests/functional/restart/45-stop-task.t similarity index 100% rename from tests/restart/45-stop-task.t rename to tests/functional/restart/45-stop-task.t diff --git a/tests/restart/48-enable-auto-stop.t b/tests/functional/restart/48-enable-auto-stop.t similarity index 100% rename from tests/restart/48-enable-auto-stop.t rename to tests/functional/restart/48-enable-auto-stop.t diff --git a/tests/restart/49-enable-auto-stop-2.t b/tests/functional/restart/49-enable-auto-stop-2.t similarity index 100% rename from tests/restart/49-enable-auto-stop-2.t rename to tests/functional/restart/49-enable-auto-stop-2.t diff --git a/tests/restart/50-ignore-stop-point.t b/tests/functional/restart/50-ignore-stop-point.t similarity index 100% rename from tests/restart/50-ignore-stop-point.t rename to tests/functional/restart/50-ignore-stop-point.t diff --git a/tests/restart/51-ignore-final-point.t b/tests/functional/restart/51-ignore-final-point.t similarity index 100% rename from tests/restart/51-ignore-final-point.t rename to tests/functional/restart/51-ignore-final-point.t diff --git a/tests/restart/bad-job-host/suite.rc b/tests/functional/restart/bad-job-host/suite.rc similarity index 100% rename from tests/restart/bad-job-host/suite.rc rename to tests/functional/restart/bad-job-host/suite.rc diff --git a/tests/restart/bad-state/suite.rc b/tests/functional/restart/bad-state/suite.rc similarity index 100% rename from tests/restart/bad-state/suite.rc rename to tests/functional/restart/bad-state/suite.rc diff --git a/tests/restart/bin/ctb-select-task-states b/tests/functional/restart/bin/ctb-select-task-states similarity index 100% rename from tests/restart/bin/ctb-select-task-states rename to tests/functional/restart/bin/ctb-select-task-states diff --git a/tests/restart/bin/shutdown_this_suite_hook b/tests/functional/restart/bin/shutdown_this_suite_hook similarity index 100% rename from tests/restart/bin/shutdown_this_suite_hook rename to tests/functional/restart/bin/shutdown_this_suite_hook diff --git a/tests/restart/broadcast/bin/ctb-select-task-states b/tests/functional/restart/broadcast/bin/ctb-select-task-states similarity index 100% rename from tests/restart/broadcast/bin/ctb-select-task-states rename to tests/functional/restart/broadcast/bin/ctb-select-task-states diff --git a/tests/restart/broadcast/suite.rc b/tests/functional/restart/broadcast/suite.rc similarity index 100% rename from tests/restart/broadcast/suite.rc rename to tests/functional/restart/broadcast/suite.rc diff --git a/tests/restart/deleted-logs/suite.rc b/tests/functional/restart/deleted-logs/suite.rc similarity index 100% rename from tests/restart/deleted-logs/suite.rc rename to tests/functional/restart/deleted-logs/suite.rc diff --git a/tests/restart/failed/bin/ctb-select-task-states b/tests/functional/restart/failed/bin/ctb-select-task-states similarity index 100% rename from tests/restart/failed/bin/ctb-select-task-states rename to tests/functional/restart/failed/bin/ctb-select-task-states diff --git a/tests/restart/failed/suite.rc b/tests/functional/restart/failed/suite.rc similarity index 100% rename from tests/restart/failed/suite.rc rename to tests/functional/restart/failed/suite.rc diff --git a/tests/restart/lib/suite-runtime-restart.rc b/tests/functional/restart/lib/suite-runtime-restart.rc similarity index 100% rename from tests/restart/lib/suite-runtime-restart.rc rename to tests/functional/restart/lib/suite-runtime-restart.rc diff --git a/tests/restart/pre-init-2/reference.log b/tests/functional/restart/pre-init-2/reference.log similarity index 100% rename from tests/restart/pre-init-2/reference.log rename to tests/functional/restart/pre-init-2/reference.log diff --git a/tests/restart/pre-init-2/suite.rc b/tests/functional/restart/pre-init-2/suite.rc similarity index 100% rename from tests/restart/pre-init-2/suite.rc rename to tests/functional/restart/pre-init-2/suite.rc diff --git a/tests/restart/reload/reference.log b/tests/functional/restart/reload/reference.log similarity index 100% rename from tests/restart/reload/reference.log rename to tests/functional/restart/reload/reference.log diff --git a/tests/restart/reload/suite.rc b/tests/functional/restart/reload/suite.rc similarity index 100% rename from tests/restart/reload/suite.rc rename to tests/functional/restart/reload/suite.rc diff --git a/tests/restart/submit-failed/bin/ctb-select-task-states b/tests/functional/restart/submit-failed/bin/ctb-select-task-states similarity index 100% rename from tests/restart/submit-failed/bin/ctb-select-task-states rename to tests/functional/restart/submit-failed/bin/ctb-select-task-states diff --git a/tests/restart/submit-failed/suite.rc b/tests/functional/restart/submit-failed/suite.rc similarity index 100% rename from tests/restart/submit-failed/suite.rc rename to tests/functional/restart/submit-failed/suite.rc diff --git a/tests/restart/succeeded/bin/ctb-select-task-states b/tests/functional/restart/succeeded/bin/ctb-select-task-states similarity index 100% rename from tests/restart/succeeded/bin/ctb-select-task-states rename to tests/functional/restart/succeeded/bin/ctb-select-task-states diff --git a/tests/restart/succeeded/suite.rc b/tests/functional/restart/succeeded/suite.rc similarity index 100% rename from tests/restart/succeeded/suite.rc rename to tests/functional/restart/succeeded/suite.rc diff --git a/tests/restart/test_header b/tests/functional/restart/test_header similarity index 100% rename from tests/restart/test_header rename to tests/functional/restart/test_header diff --git a/tests/restart/waiting/bin/ctb-select-task-states b/tests/functional/restart/waiting/bin/ctb-select-task-states similarity index 100% rename from tests/restart/waiting/bin/ctb-select-task-states rename to tests/functional/restart/waiting/bin/ctb-select-task-states diff --git a/tests/restart/waiting/suite.rc b/tests/functional/restart/waiting/suite.rc similarity index 100% rename from tests/restart/waiting/suite.rc rename to tests/functional/restart/waiting/suite.rc diff --git a/tests/retries/00-execution-retry.t b/tests/functional/retries/00-execution-retry.t similarity index 100% rename from tests/retries/00-execution-retry.t rename to tests/functional/retries/00-execution-retry.t diff --git a/tests/retries/01-submission-retry.t b/tests/functional/retries/01-submission-retry.t similarity index 100% rename from tests/retries/01-submission-retry.t rename to tests/functional/retries/01-submission-retry.t diff --git a/tests/retries/execution/reference.log b/tests/functional/retries/execution/reference.log similarity index 100% rename from tests/retries/execution/reference.log rename to tests/functional/retries/execution/reference.log diff --git a/tests/retries/execution/suite.rc b/tests/functional/retries/execution/suite.rc similarity index 100% rename from tests/retries/execution/suite.rc rename to tests/functional/retries/execution/suite.rc diff --git a/tests/retries/submission/reference.log b/tests/functional/retries/submission/reference.log similarity index 100% rename from tests/retries/submission/reference.log rename to tests/functional/retries/submission/reference.log diff --git a/tests/retries/submission/suite.rc b/tests/functional/retries/submission/suite.rc similarity index 100% rename from tests/retries/submission/suite.rc rename to tests/functional/retries/submission/suite.rc diff --git a/tests/retries/test_header b/tests/functional/retries/test_header similarity index 100% rename from tests/retries/test_header rename to tests/functional/retries/test_header diff --git a/tests/rnd/00-run-funtional-tests.t b/tests/functional/rnd/00-run-funtional-tests.t similarity index 100% rename from tests/rnd/00-run-funtional-tests.t rename to tests/functional/rnd/00-run-funtional-tests.t diff --git a/tests/rnd/02-lib-python-in-job.t b/tests/functional/rnd/02-lib-python-in-job.t similarity index 100% rename from tests/rnd/02-lib-python-in-job.t rename to tests/functional/rnd/02-lib-python-in-job.t diff --git a/tests/rnd/02-lib-python-in-job/lib/python/pub/beer.py b/tests/functional/rnd/02-lib-python-in-job/lib/python/pub/beer.py similarity index 100% rename from tests/rnd/02-lib-python-in-job/lib/python/pub/beer.py rename to tests/functional/rnd/02-lib-python-in-job/lib/python/pub/beer.py diff --git a/tests/rnd/02-lib-python-in-job/suite.rc b/tests/functional/rnd/02-lib-python-in-job/suite.rc similarity index 100% rename from tests/rnd/02-lib-python-in-job/suite.rc rename to tests/functional/rnd/02-lib-python-in-job/suite.rc diff --git a/tests/rnd/test_header b/tests/functional/rnd/test_header similarity index 100% rename from tests/rnd/test_header rename to tests/functional/rnd/test_header diff --git a/tests/runahead/00-runahead.t b/tests/functional/runahead/00-runahead.t similarity index 100% rename from tests/runahead/00-runahead.t rename to tests/functional/runahead/00-runahead.t diff --git a/tests/runahead/01-check-default-simple.t b/tests/functional/runahead/01-check-default-simple.t similarity index 100% rename from tests/runahead/01-check-default-simple.t rename to tests/functional/runahead/01-check-default-simple.t diff --git a/tests/runahead/02-check-default-complex.t b/tests/functional/runahead/02-check-default-complex.t similarity index 100% rename from tests/runahead/02-check-default-complex.t rename to tests/functional/runahead/02-check-default-complex.t diff --git a/tests/runahead/03-check-default-future.t b/tests/functional/runahead/03-check-default-future.t similarity index 100% rename from tests/runahead/03-check-default-future.t rename to tests/functional/runahead/03-check-default-future.t diff --git a/tests/runahead/04-no-final-cycle.t b/tests/functional/runahead/04-no-final-cycle.t similarity index 100% rename from tests/runahead/04-no-final-cycle.t rename to tests/functional/runahead/04-no-final-cycle.t diff --git a/tests/runahead/05-check-default-future-2.t b/tests/functional/runahead/05-check-default-future-2.t similarity index 100% rename from tests/runahead/05-check-default-future-2.t rename to tests/functional/runahead/05-check-default-future-2.t diff --git a/tests/runahead/06-release-update.t b/tests/functional/runahead/06-release-update.t similarity index 100% rename from tests/runahead/06-release-update.t rename to tests/functional/runahead/06-release-update.t diff --git a/tests/runahead/default-complex/suite.rc b/tests/functional/runahead/default-complex/suite.rc similarity index 100% rename from tests/runahead/default-complex/suite.rc rename to tests/functional/runahead/default-complex/suite.rc diff --git a/tests/runahead/default-future/suite.rc b/tests/functional/runahead/default-future/suite.rc similarity index 100% rename from tests/runahead/default-future/suite.rc rename to tests/functional/runahead/default-future/suite.rc diff --git a/tests/runahead/default-simple/suite.rc b/tests/functional/runahead/default-simple/suite.rc similarity index 100% rename from tests/runahead/default-simple/suite.rc rename to tests/functional/runahead/default-simple/suite.rc diff --git a/tests/runahead/no_final/suite.rc b/tests/functional/runahead/no_final/suite.rc similarity index 100% rename from tests/runahead/no_final/suite.rc rename to tests/functional/runahead/no_final/suite.rc diff --git a/tests/runahead/release-update/suite.rc b/tests/functional/runahead/release-update/suite.rc similarity index 100% rename from tests/runahead/release-update/suite.rc rename to tests/functional/runahead/release-update/suite.rc diff --git a/tests/runahead/runahead/suite.rc b/tests/functional/runahead/runahead/suite.rc similarity index 100% rename from tests/runahead/runahead/suite.rc rename to tests/functional/runahead/runahead/suite.rc diff --git a/tests/runahead/test_header b/tests/functional/runahead/test_header similarity index 100% rename from tests/runahead/test_header rename to tests/functional/runahead/test_header diff --git a/tests/shutdown/00-cycle.t b/tests/functional/shutdown/00-cycle.t similarity index 100% rename from tests/shutdown/00-cycle.t rename to tests/functional/shutdown/00-cycle.t diff --git a/tests/shutdown/00-cycle/reference.log b/tests/functional/shutdown/00-cycle/reference.log similarity index 100% rename from tests/shutdown/00-cycle/reference.log rename to tests/functional/shutdown/00-cycle/reference.log diff --git a/tests/shutdown/00-cycle/suite.rc b/tests/functional/shutdown/00-cycle/suite.rc similarity index 100% rename from tests/shutdown/00-cycle/suite.rc rename to tests/functional/shutdown/00-cycle/suite.rc diff --git a/tests/shutdown/01-task.t b/tests/functional/shutdown/01-task.t similarity index 100% rename from tests/shutdown/01-task.t rename to tests/functional/shutdown/01-task.t diff --git a/tests/shutdown/01-task/reference.log b/tests/functional/shutdown/01-task/reference.log similarity index 100% rename from tests/shutdown/01-task/reference.log rename to tests/functional/shutdown/01-task/reference.log diff --git a/tests/shutdown/01-task/suite.rc b/tests/functional/shutdown/01-task/suite.rc similarity index 100% rename from tests/shutdown/01-task/suite.rc rename to tests/functional/shutdown/01-task/suite.rc diff --git a/tests/shutdown/03-bad-cycle.t b/tests/functional/shutdown/03-bad-cycle.t similarity index 100% rename from tests/shutdown/03-bad-cycle.t rename to tests/functional/shutdown/03-bad-cycle.t diff --git a/tests/shutdown/03-bad-cycle/suite.rc b/tests/functional/shutdown/03-bad-cycle/suite.rc similarity index 100% rename from tests/shutdown/03-bad-cycle/suite.rc rename to tests/functional/shutdown/03-bad-cycle/suite.rc diff --git a/tests/shutdown/04-kill.t b/tests/functional/shutdown/04-kill.t similarity index 100% rename from tests/shutdown/04-kill.t rename to tests/functional/shutdown/04-kill.t diff --git a/tests/shutdown/04-kill/reference.log b/tests/functional/shutdown/04-kill/reference.log similarity index 100% rename from tests/shutdown/04-kill/reference.log rename to tests/functional/shutdown/04-kill/reference.log diff --git a/tests/shutdown/04-kill/suite.rc b/tests/functional/shutdown/04-kill/suite.rc similarity index 100% rename from tests/shutdown/04-kill/suite.rc rename to tests/functional/shutdown/04-kill/suite.rc diff --git a/tests/shutdown/05-auto.t b/tests/functional/shutdown/05-auto.t similarity index 100% rename from tests/shutdown/05-auto.t rename to tests/functional/shutdown/05-auto.t diff --git a/tests/shutdown/05-auto/suite.rc b/tests/functional/shutdown/05-auto/suite.rc similarity index 100% rename from tests/shutdown/05-auto/suite.rc rename to tests/functional/shutdown/05-auto/suite.rc diff --git a/tests/shutdown/06-kill-fail.t b/tests/functional/shutdown/06-kill-fail.t similarity index 100% rename from tests/shutdown/06-kill-fail.t rename to tests/functional/shutdown/06-kill-fail.t diff --git a/tests/shutdown/06-kill-fail/suite.rc b/tests/functional/shutdown/06-kill-fail/suite.rc similarity index 100% rename from tests/shutdown/06-kill-fail/suite.rc rename to tests/functional/shutdown/06-kill-fail/suite.rc diff --git a/tests/shutdown/07-task-fail.t b/tests/functional/shutdown/07-task-fail.t similarity index 100% rename from tests/shutdown/07-task-fail.t rename to tests/functional/shutdown/07-task-fail.t diff --git a/tests/shutdown/07-task-fail/suite.rc b/tests/functional/shutdown/07-task-fail/suite.rc similarity index 100% rename from tests/shutdown/07-task-fail/suite.rc rename to tests/functional/shutdown/07-task-fail/suite.rc diff --git a/tests/shutdown/08-now1.t b/tests/functional/shutdown/08-now1.t similarity index 100% rename from tests/shutdown/08-now1.t rename to tests/functional/shutdown/08-now1.t diff --git a/tests/shutdown/08-now1/suite.rc b/tests/functional/shutdown/08-now1/suite.rc similarity index 100% rename from tests/shutdown/08-now1/suite.rc rename to tests/functional/shutdown/08-now1/suite.rc diff --git a/tests/shutdown/09-now2.t b/tests/functional/shutdown/09-now2.t similarity index 100% rename from tests/shutdown/09-now2.t rename to tests/functional/shutdown/09-now2.t diff --git a/tests/shutdown/09-now2/suite.rc b/tests/functional/shutdown/09-now2/suite.rc similarity index 100% rename from tests/shutdown/09-now2/suite.rc rename to tests/functional/shutdown/09-now2/suite.rc diff --git a/tests/shutdown/10-no-port-file.t b/tests/functional/shutdown/10-no-port-file.t similarity index 100% rename from tests/shutdown/10-no-port-file.t rename to tests/functional/shutdown/10-no-port-file.t diff --git a/tests/shutdown/10-no-port-file/suite.rc b/tests/functional/shutdown/10-no-port-file/suite.rc similarity index 100% rename from tests/shutdown/10-no-port-file/suite.rc rename to tests/functional/shutdown/10-no-port-file/suite.rc diff --git a/tests/shutdown/11-bad-port-file.t b/tests/functional/shutdown/11-bad-port-file.t similarity index 100% rename from tests/shutdown/11-bad-port-file.t rename to tests/functional/shutdown/11-bad-port-file.t diff --git a/tests/shutdown/11-bad-port-file/suite.rc b/tests/functional/shutdown/11-bad-port-file/suite.rc similarity index 100% rename from tests/shutdown/11-bad-port-file/suite.rc rename to tests/functional/shutdown/11-bad-port-file/suite.rc diff --git a/tests/shutdown/12-bad-port-file-check.t b/tests/functional/shutdown/12-bad-port-file-check.t similarity index 100% rename from tests/shutdown/12-bad-port-file-check.t rename to tests/functional/shutdown/12-bad-port-file-check.t diff --git a/tests/shutdown/12-bad-port-file-check/suite.rc b/tests/functional/shutdown/12-bad-port-file-check/suite.rc similarity index 100% rename from tests/shutdown/12-bad-port-file-check/suite.rc rename to tests/functional/shutdown/12-bad-port-file-check/suite.rc diff --git a/tests/shutdown/13-no-port-file-check.t b/tests/functional/shutdown/13-no-port-file-check.t similarity index 100% rename from tests/shutdown/13-no-port-file-check.t rename to tests/functional/shutdown/13-no-port-file-check.t diff --git a/tests/shutdown/13-no-port-file-check/suite.rc b/tests/functional/shutdown/13-no-port-file-check/suite.rc similarity index 100% rename from tests/shutdown/13-no-port-file-check/suite.rc rename to tests/functional/shutdown/13-no-port-file-check/suite.rc diff --git a/tests/shutdown/14-no-dir-check.t b/tests/functional/shutdown/14-no-dir-check.t similarity index 100% rename from tests/shutdown/14-no-dir-check.t rename to tests/functional/shutdown/14-no-dir-check.t diff --git a/tests/shutdown/14-no-dir-check/suite.rc b/tests/functional/shutdown/14-no-dir-check/suite.rc similarity index 100% rename from tests/shutdown/14-no-dir-check/suite.rc rename to tests/functional/shutdown/14-no-dir-check/suite.rc diff --git a/tests/shutdown/15-bad-port-file-check-globalcfg b/tests/functional/shutdown/15-bad-port-file-check-globalcfg similarity index 100% rename from tests/shutdown/15-bad-port-file-check-globalcfg rename to tests/functional/shutdown/15-bad-port-file-check-globalcfg diff --git a/tests/shutdown/15-bad-port-file-check-globalcfg.t b/tests/functional/shutdown/15-bad-port-file-check-globalcfg.t similarity index 100% rename from tests/shutdown/15-bad-port-file-check-globalcfg.t rename to tests/functional/shutdown/15-bad-port-file-check-globalcfg.t diff --git a/tests/shutdown/16-no-port-file-check-globalcfg b/tests/functional/shutdown/16-no-port-file-check-globalcfg similarity index 100% rename from tests/shutdown/16-no-port-file-check-globalcfg rename to tests/functional/shutdown/16-no-port-file-check-globalcfg diff --git a/tests/shutdown/16-no-port-file-check-globalcfg.t b/tests/functional/shutdown/16-no-port-file-check-globalcfg.t similarity index 100% rename from tests/shutdown/16-no-port-file-check-globalcfg.t rename to tests/functional/shutdown/16-no-port-file-check-globalcfg.t diff --git a/tests/shutdown/17-no-dir-check-globalcfg b/tests/functional/shutdown/17-no-dir-check-globalcfg similarity index 100% rename from tests/shutdown/17-no-dir-check-globalcfg rename to tests/functional/shutdown/17-no-dir-check-globalcfg diff --git a/tests/shutdown/17-no-dir-check-globalcfg.t b/tests/functional/shutdown/17-no-dir-check-globalcfg.t similarity index 100% rename from tests/shutdown/17-no-dir-check-globalcfg.t rename to tests/functional/shutdown/17-no-dir-check-globalcfg.t diff --git a/tests/shutdown/18-client-on-dead-suite.t b/tests/functional/shutdown/18-client-on-dead-suite.t similarity index 100% rename from tests/shutdown/18-client-on-dead-suite.t rename to tests/functional/shutdown/18-client-on-dead-suite.t diff --git a/tests/shutdown/19-log-reference.t b/tests/functional/shutdown/19-log-reference.t similarity index 100% rename from tests/shutdown/19-log-reference.t rename to tests/functional/shutdown/19-log-reference.t diff --git a/tests/shutdown/test_header b/tests/functional/shutdown/test_header similarity index 100% rename from tests/shutdown/test_header rename to tests/functional/shutdown/test_header diff --git a/tests/spawn-max/00-basic.t b/tests/functional/spawn-max/00-basic.t similarity index 100% rename from tests/spawn-max/00-basic.t rename to tests/functional/spawn-max/00-basic.t diff --git a/tests/spawn-max/00-basic/reference.log b/tests/functional/spawn-max/00-basic/reference.log similarity index 100% rename from tests/spawn-max/00-basic/reference.log rename to tests/functional/spawn-max/00-basic/reference.log diff --git a/tests/spawn-max/00-basic/suite.rc b/tests/functional/spawn-max/00-basic/suite.rc similarity index 100% rename from tests/spawn-max/00-basic/suite.rc rename to tests/functional/spawn-max/00-basic/suite.rc diff --git a/tests/spawn-max/test_header b/tests/functional/spawn-max/test_header similarity index 100% rename from tests/spawn-max/test_header rename to tests/functional/spawn-max/test_header diff --git a/tests/special/00-sequential.t b/tests/functional/special/00-sequential.t similarity index 100% rename from tests/special/00-sequential.t rename to tests/functional/special/00-sequential.t diff --git a/tests/special/00-sequential/reference.log b/tests/functional/special/00-sequential/reference.log similarity index 100% rename from tests/special/00-sequential/reference.log rename to tests/functional/special/00-sequential/reference.log diff --git a/tests/special/00-sequential/suite.rc b/tests/functional/special/00-sequential/suite.rc similarity index 100% rename from tests/special/00-sequential/suite.rc rename to tests/functional/special/00-sequential/suite.rc diff --git a/tests/special/02-exclude.t b/tests/functional/special/02-exclude.t similarity index 100% rename from tests/special/02-exclude.t rename to tests/functional/special/02-exclude.t diff --git a/tests/special/02-exclude/reference.log b/tests/functional/special/02-exclude/reference.log similarity index 100% rename from tests/special/02-exclude/reference.log rename to tests/functional/special/02-exclude/reference.log diff --git a/tests/special/02-exclude/suite.rc b/tests/functional/special/02-exclude/suite.rc similarity index 100% rename from tests/special/02-exclude/suite.rc rename to tests/functional/special/02-exclude/suite.rc diff --git a/tests/special/03-include.t b/tests/functional/special/03-include.t similarity index 100% rename from tests/special/03-include.t rename to tests/functional/special/03-include.t diff --git a/tests/special/03-include/reference.log b/tests/functional/special/03-include/reference.log similarity index 100% rename from tests/special/03-include/reference.log rename to tests/functional/special/03-include/reference.log diff --git a/tests/special/03-include/suite.rc b/tests/functional/special/03-include/suite.rc similarity index 100% rename from tests/special/03-include/suite.rc rename to tests/functional/special/03-include/suite.rc diff --git a/tests/special/07-clock-triggered-360.t b/tests/functional/special/07-clock-triggered-360.t similarity index 100% rename from tests/special/07-clock-triggered-360.t rename to tests/functional/special/07-clock-triggered-360.t diff --git a/tests/special/clock-360/suite.rc b/tests/functional/special/clock-360/suite.rc similarity index 100% rename from tests/special/clock-360/suite.rc rename to tests/functional/special/clock-360/suite.rc diff --git a/tests/special/test_header b/tests/functional/special/test_header similarity index 100% rename from tests/special/test_header rename to tests/functional/special/test_header diff --git a/tests/startup/00-state-summary.t b/tests/functional/startup/00-state-summary.t similarity index 100% rename from tests/startup/00-state-summary.t rename to tests/functional/startup/00-state-summary.t diff --git a/tests/startup/00-state-summary/suite.rc b/tests/functional/startup/00-state-summary/suite.rc similarity index 100% rename from tests/startup/00-state-summary/suite.rc rename to tests/functional/startup/00-state-summary/suite.rc diff --git a/tests/startup/01-log-suiterc.t b/tests/functional/startup/01-log-suiterc.t similarity index 100% rename from tests/startup/01-log-suiterc.t rename to tests/functional/startup/01-log-suiterc.t diff --git a/tests/startup/test_header b/tests/functional/startup/test_header similarity index 100% rename from tests/startup/test_header rename to tests/functional/startup/test_header diff --git a/tests/suite-host-self-id/00-address.t b/tests/functional/suite-host-self-id/00-address.t similarity index 100% rename from tests/suite-host-self-id/00-address.t rename to tests/functional/suite-host-self-id/00-address.t diff --git a/tests/suite-host-self-id/00-address/reference.log b/tests/functional/suite-host-self-id/00-address/reference.log similarity index 100% rename from tests/suite-host-self-id/00-address/reference.log rename to tests/functional/suite-host-self-id/00-address/reference.log diff --git a/tests/suite-host-self-id/00-address/suite.rc b/tests/functional/suite-host-self-id/00-address/suite.rc similarity index 100% rename from tests/suite-host-self-id/00-address/suite.rc rename to tests/functional/suite-host-self-id/00-address/suite.rc diff --git a/tests/suite-host-self-id/test_header b/tests/functional/suite-host-self-id/test_header similarity index 100% rename from tests/suite-host-self-id/test_header rename to tests/functional/suite-host-self-id/test_header diff --git a/tests/suite-state/00-polling.t b/tests/functional/suite-state/00-polling.t similarity index 100% rename from tests/suite-state/00-polling.t rename to tests/functional/suite-state/00-polling.t diff --git a/tests/suite-state/01-polling.t b/tests/functional/suite-state/01-polling.t similarity index 100% rename from tests/suite-state/01-polling.t rename to tests/functional/suite-state/01-polling.t diff --git a/tests/suite-state/02-validate-blank-command-scripting.t b/tests/functional/suite-state/02-validate-blank-command-scripting.t similarity index 100% rename from tests/suite-state/02-validate-blank-command-scripting.t rename to tests/functional/suite-state/02-validate-blank-command-scripting.t diff --git a/tests/suite-state/02-validate-blank-command-scripting/suite.rc b/tests/functional/suite-state/02-validate-blank-command-scripting/suite.rc similarity index 100% rename from tests/suite-state/02-validate-blank-command-scripting/suite.rc rename to tests/functional/suite-state/02-validate-blank-command-scripting/suite.rc diff --git a/tests/suite-state/03-options.t b/tests/functional/suite-state/03-options.t similarity index 100% rename from tests/suite-state/03-options.t rename to tests/functional/suite-state/03-options.t diff --git a/tests/suite-state/04-template.t b/tests/functional/suite-state/04-template.t similarity index 100% rename from tests/suite-state/04-template.t rename to tests/functional/suite-state/04-template.t diff --git a/tests/suite-state/05-message.t b/tests/functional/suite-state/05-message.t similarity index 100% rename from tests/suite-state/05-message.t rename to tests/functional/suite-state/05-message.t diff --git a/tests/suite-state/06-format.t b/tests/functional/suite-state/06-format.t similarity index 100% rename from tests/suite-state/06-format.t rename to tests/functional/suite-state/06-format.t diff --git a/tests/suite-state/06a-noformat.t b/tests/functional/suite-state/06a-noformat.t similarity index 100% rename from tests/suite-state/06a-noformat.t rename to tests/functional/suite-state/06a-noformat.t diff --git a/tests/suite-state/07-message2.t b/tests/functional/suite-state/07-message2.t similarity index 100% rename from tests/suite-state/07-message2.t rename to tests/functional/suite-state/07-message2.t diff --git a/tests/suite-state/07-message2/suite.rc b/tests/functional/suite-state/07-message2/suite.rc similarity index 100% rename from tests/suite-state/07-message2/suite.rc rename to tests/functional/suite-state/07-message2/suite.rc diff --git a/tests/suite-state/message/reference.log b/tests/functional/suite-state/message/reference.log similarity index 100% rename from tests/suite-state/message/reference.log rename to tests/functional/suite-state/message/reference.log diff --git a/tests/suite-state/message/suite.rc b/tests/functional/suite-state/message/suite.rc similarity index 100% rename from tests/suite-state/message/suite.rc rename to tests/functional/suite-state/message/suite.rc diff --git a/tests/suite-state/options/reference.log b/tests/functional/suite-state/options/reference.log similarity index 100% rename from tests/suite-state/options/reference.log rename to tests/functional/suite-state/options/reference.log diff --git a/tests/suite-state/options/suite.rc b/tests/functional/suite-state/options/suite.rc similarity index 100% rename from tests/suite-state/options/suite.rc rename to tests/functional/suite-state/options/suite.rc diff --git a/tests/suite-state/polling/reference.log b/tests/functional/suite-state/polling/reference.log similarity index 100% rename from tests/suite-state/polling/reference.log rename to tests/functional/suite-state/polling/reference.log diff --git a/tests/suite-state/polling/suite.rc b/tests/functional/suite-state/polling/suite.rc similarity index 100% rename from tests/suite-state/polling/suite.rc rename to tests/functional/suite-state/polling/suite.rc diff --git a/tests/suite-state/template/reference.log b/tests/functional/suite-state/template/reference.log similarity index 100% rename from tests/suite-state/template/reference.log rename to tests/functional/suite-state/template/reference.log diff --git a/tests/suite-state/template/suite.rc b/tests/functional/suite-state/template/suite.rc similarity index 100% rename from tests/suite-state/template/suite.rc rename to tests/functional/suite-state/template/suite.rc diff --git a/tests/suite-state/template_ref/reference.log b/tests/functional/suite-state/template_ref/reference.log similarity index 100% rename from tests/suite-state/template_ref/reference.log rename to tests/functional/suite-state/template_ref/reference.log diff --git a/tests/suite-state/template_ref/suite.rc b/tests/functional/suite-state/template_ref/suite.rc similarity index 100% rename from tests/suite-state/template_ref/suite.rc rename to tests/functional/suite-state/template_ref/suite.rc diff --git a/tests/suite-state/test_header b/tests/functional/suite-state/test_header similarity index 100% rename from tests/suite-state/test_header rename to tests/functional/suite-state/test_header diff --git a/tests/suite-state/upstream/suite.rc b/tests/functional/suite-state/upstream/suite.rc similarity index 100% rename from tests/suite-state/upstream/suite.rc rename to tests/functional/suite-state/upstream/suite.rc diff --git a/tests/task-name/00-basic.t b/tests/functional/task-name/00-basic.t similarity index 100% rename from tests/task-name/00-basic.t rename to tests/functional/task-name/00-basic.t diff --git a/tests/task-name/00-basic/reference.log b/tests/functional/task-name/00-basic/reference.log similarity index 100% rename from tests/task-name/00-basic/reference.log rename to tests/functional/task-name/00-basic/reference.log diff --git a/tests/task-name/00-basic/suite.rc b/tests/functional/task-name/00-basic/suite.rc similarity index 100% rename from tests/task-name/00-basic/suite.rc rename to tests/functional/task-name/00-basic/suite.rc diff --git a/tests/task-name/test_header b/tests/functional/task-name/test_header similarity index 100% rename from tests/task-name/test_header rename to tests/functional/task-name/test_header diff --git a/tests/task-proc-loop/00-count.t b/tests/functional/task-proc-loop/00-count.t similarity index 100% rename from tests/task-proc-loop/00-count.t rename to tests/functional/task-proc-loop/00-count.t diff --git a/tests/task-proc-loop/00-count/suite.rc b/tests/functional/task-proc-loop/00-count/suite.rc similarity index 100% rename from tests/task-proc-loop/00-count/suite.rc rename to tests/functional/task-proc-loop/00-count/suite.rc diff --git a/tests/task-proc-loop/test_header b/tests/functional/task-proc-loop/test_header similarity index 100% rename from tests/task-proc-loop/test_header rename to tests/functional/task-proc-loop/test_header diff --git a/tests/triggering/00-recovery.t b/tests/functional/triggering/00-recovery.t similarity index 100% rename from tests/triggering/00-recovery.t rename to tests/functional/triggering/00-recovery.t diff --git a/tests/triggering/00-recovery/reference.log b/tests/functional/triggering/00-recovery/reference.log similarity index 100% rename from tests/triggering/00-recovery/reference.log rename to tests/functional/triggering/00-recovery/reference.log diff --git a/tests/triggering/00-recovery/suite.rc b/tests/functional/triggering/00-recovery/suite.rc similarity index 100% rename from tests/triggering/00-recovery/suite.rc rename to tests/functional/triggering/00-recovery/suite.rc diff --git a/tests/triggering/01-or-conditional.t b/tests/functional/triggering/01-or-conditional.t similarity index 100% rename from tests/triggering/01-or-conditional.t rename to tests/functional/triggering/01-or-conditional.t diff --git a/tests/triggering/01-or-conditional/reference.log b/tests/functional/triggering/01-or-conditional/reference.log similarity index 100% rename from tests/triggering/01-or-conditional/reference.log rename to tests/functional/triggering/01-or-conditional/reference.log diff --git a/tests/triggering/01-or-conditional/suite.rc b/tests/functional/triggering/01-or-conditional/suite.rc similarity index 100% rename from tests/triggering/01-or-conditional/suite.rc rename to tests/functional/triggering/01-or-conditional/suite.rc diff --git a/tests/triggering/02-fam-start-all.t b/tests/functional/triggering/02-fam-start-all.t similarity index 100% rename from tests/triggering/02-fam-start-all.t rename to tests/functional/triggering/02-fam-start-all.t diff --git a/tests/triggering/02-fam-start-all/reference.log b/tests/functional/triggering/02-fam-start-all/reference.log similarity index 100% rename from tests/triggering/02-fam-start-all/reference.log rename to tests/functional/triggering/02-fam-start-all/reference.log diff --git a/tests/triggering/02-fam-start-all/suite.rc b/tests/functional/triggering/02-fam-start-all/suite.rc similarity index 100% rename from tests/triggering/02-fam-start-all/suite.rc rename to tests/functional/triggering/02-fam-start-all/suite.rc diff --git a/tests/triggering/03-fam-succeed-all.t b/tests/functional/triggering/03-fam-succeed-all.t similarity index 100% rename from tests/triggering/03-fam-succeed-all.t rename to tests/functional/triggering/03-fam-succeed-all.t diff --git a/tests/triggering/03-fam-succeed-all/reference.log b/tests/functional/triggering/03-fam-succeed-all/reference.log similarity index 100% rename from tests/triggering/03-fam-succeed-all/reference.log rename to tests/functional/triggering/03-fam-succeed-all/reference.log diff --git a/tests/triggering/03-fam-succeed-all/suite.rc b/tests/functional/triggering/03-fam-succeed-all/suite.rc similarity index 100% rename from tests/triggering/03-fam-succeed-all/suite.rc rename to tests/functional/triggering/03-fam-succeed-all/suite.rc diff --git a/tests/triggering/04-fam-fail-all.t b/tests/functional/triggering/04-fam-fail-all.t similarity index 100% rename from tests/triggering/04-fam-fail-all.t rename to tests/functional/triggering/04-fam-fail-all.t diff --git a/tests/triggering/04-fam-fail-all/reference.log b/tests/functional/triggering/04-fam-fail-all/reference.log similarity index 100% rename from tests/triggering/04-fam-fail-all/reference.log rename to tests/functional/triggering/04-fam-fail-all/reference.log diff --git a/tests/triggering/04-fam-fail-all/suite.rc b/tests/functional/triggering/04-fam-fail-all/suite.rc similarity index 100% rename from tests/triggering/04-fam-fail-all/suite.rc rename to tests/functional/triggering/04-fam-fail-all/suite.rc diff --git a/tests/triggering/05-fam-finish-all.t b/tests/functional/triggering/05-fam-finish-all.t similarity index 100% rename from tests/triggering/05-fam-finish-all.t rename to tests/functional/triggering/05-fam-finish-all.t diff --git a/tests/triggering/05-fam-finish-all/reference.log b/tests/functional/triggering/05-fam-finish-all/reference.log similarity index 100% rename from tests/triggering/05-fam-finish-all/reference.log rename to tests/functional/triggering/05-fam-finish-all/reference.log diff --git a/tests/triggering/05-fam-finish-all/suite.rc b/tests/functional/triggering/05-fam-finish-all/suite.rc similarity index 100% rename from tests/triggering/05-fam-finish-all/suite.rc rename to tests/functional/triggering/05-fam-finish-all/suite.rc diff --git a/tests/triggering/06-fam-succeed-any.t b/tests/functional/triggering/06-fam-succeed-any.t similarity index 100% rename from tests/triggering/06-fam-succeed-any.t rename to tests/functional/triggering/06-fam-succeed-any.t diff --git a/tests/triggering/06-fam-succeed-any/reference.log b/tests/functional/triggering/06-fam-succeed-any/reference.log similarity index 100% rename from tests/triggering/06-fam-succeed-any/reference.log rename to tests/functional/triggering/06-fam-succeed-any/reference.log diff --git a/tests/triggering/06-fam-succeed-any/suite.rc b/tests/functional/triggering/06-fam-succeed-any/suite.rc similarity index 100% rename from tests/triggering/06-fam-succeed-any/suite.rc rename to tests/functional/triggering/06-fam-succeed-any/suite.rc diff --git a/tests/triggering/07-fam-fail-any.t b/tests/functional/triggering/07-fam-fail-any.t similarity index 100% rename from tests/triggering/07-fam-fail-any.t rename to tests/functional/triggering/07-fam-fail-any.t diff --git a/tests/triggering/07-fam-fail-any/reference.log b/tests/functional/triggering/07-fam-fail-any/reference.log similarity index 100% rename from tests/triggering/07-fam-fail-any/reference.log rename to tests/functional/triggering/07-fam-fail-any/reference.log diff --git a/tests/triggering/07-fam-fail-any/suite.rc b/tests/functional/triggering/07-fam-fail-any/suite.rc similarity index 100% rename from tests/triggering/07-fam-fail-any/suite.rc rename to tests/functional/triggering/07-fam-fail-any/suite.rc diff --git a/tests/triggering/08-fam-finish-any.t b/tests/functional/triggering/08-fam-finish-any.t similarity index 100% rename from tests/triggering/08-fam-finish-any.t rename to tests/functional/triggering/08-fam-finish-any.t diff --git a/tests/triggering/08-fam-finish-any/reference.log b/tests/functional/triggering/08-fam-finish-any/reference.log similarity index 100% rename from tests/triggering/08-fam-finish-any/reference.log rename to tests/functional/triggering/08-fam-finish-any/reference.log diff --git a/tests/triggering/08-fam-finish-any/suite.rc b/tests/functional/triggering/08-fam-finish-any/suite.rc similarity index 100% rename from tests/triggering/08-fam-finish-any/suite.rc rename to tests/functional/triggering/08-fam-finish-any/suite.rc diff --git a/tests/triggering/09-fail.t b/tests/functional/triggering/09-fail.t similarity index 100% rename from tests/triggering/09-fail.t rename to tests/functional/triggering/09-fail.t diff --git a/tests/triggering/09-fail/reference.log b/tests/functional/triggering/09-fail/reference.log similarity index 100% rename from tests/triggering/09-fail/reference.log rename to tests/functional/triggering/09-fail/reference.log diff --git a/tests/triggering/09-fail/suite.rc b/tests/functional/triggering/09-fail/suite.rc similarity index 100% rename from tests/triggering/09-fail/suite.rc rename to tests/functional/triggering/09-fail/suite.rc diff --git a/tests/triggering/10-finish.t b/tests/functional/triggering/10-finish.t similarity index 100% rename from tests/triggering/10-finish.t rename to tests/functional/triggering/10-finish.t diff --git a/tests/triggering/10-finish/reference.log b/tests/functional/triggering/10-finish/reference.log similarity index 100% rename from tests/triggering/10-finish/reference.log rename to tests/functional/triggering/10-finish/reference.log diff --git a/tests/triggering/10-finish/suite.rc b/tests/functional/triggering/10-finish/suite.rc similarity index 100% rename from tests/triggering/10-finish/suite.rc rename to tests/functional/triggering/10-finish/suite.rc diff --git a/tests/triggering/11-start.t b/tests/functional/triggering/11-start.t similarity index 100% rename from tests/triggering/11-start.t rename to tests/functional/triggering/11-start.t diff --git a/tests/triggering/11-start/reference.log b/tests/functional/triggering/11-start/reference.log similarity index 100% rename from tests/triggering/11-start/reference.log rename to tests/functional/triggering/11-start/reference.log diff --git a/tests/triggering/11-start/suite.rc b/tests/functional/triggering/11-start/suite.rc similarity index 100% rename from tests/triggering/11-start/suite.rc rename to tests/functional/triggering/11-start/suite.rc diff --git a/tests/triggering/12-succeed.t b/tests/functional/triggering/12-succeed.t similarity index 100% rename from tests/triggering/12-succeed.t rename to tests/functional/triggering/12-succeed.t diff --git a/tests/triggering/12-succeed/reference.log b/tests/functional/triggering/12-succeed/reference.log similarity index 100% rename from tests/triggering/12-succeed/reference.log rename to tests/functional/triggering/12-succeed/reference.log diff --git a/tests/triggering/12-succeed/suite.rc b/tests/functional/triggering/12-succeed/suite.rc similarity index 100% rename from tests/triggering/12-succeed/suite.rc rename to tests/functional/triggering/12-succeed/suite.rc diff --git a/tests/triggering/13-submit.t b/tests/functional/triggering/13-submit.t similarity index 100% rename from tests/triggering/13-submit.t rename to tests/functional/triggering/13-submit.t diff --git a/tests/triggering/13-submit/reference.log b/tests/functional/triggering/13-submit/reference.log similarity index 100% rename from tests/triggering/13-submit/reference.log rename to tests/functional/triggering/13-submit/reference.log diff --git a/tests/triggering/13-submit/suite.rc b/tests/functional/triggering/13-submit/suite.rc similarity index 100% rename from tests/triggering/13-submit/suite.rc rename to tests/functional/triggering/13-submit/suite.rc diff --git a/tests/triggering/14-submit-fail.t b/tests/functional/triggering/14-submit-fail.t similarity index 100% rename from tests/triggering/14-submit-fail.t rename to tests/functional/triggering/14-submit-fail.t diff --git a/tests/triggering/14-submit-fail/reference.log b/tests/functional/triggering/14-submit-fail/reference.log similarity index 100% rename from tests/triggering/14-submit-fail/reference.log rename to tests/functional/triggering/14-submit-fail/reference.log diff --git a/tests/triggering/14-submit-fail/suite.rc b/tests/functional/triggering/14-submit-fail/suite.rc similarity index 100% rename from tests/triggering/14-submit-fail/suite.rc rename to tests/functional/triggering/14-submit-fail/suite.rc diff --git a/tests/triggering/15-suicide.t b/tests/functional/triggering/15-suicide.t similarity index 100% rename from tests/triggering/15-suicide.t rename to tests/functional/triggering/15-suicide.t diff --git a/tests/triggering/15-suicide/reference.log b/tests/functional/triggering/15-suicide/reference.log similarity index 100% rename from tests/triggering/15-suicide/reference.log rename to tests/functional/triggering/15-suicide/reference.log diff --git a/tests/triggering/15-suicide/suite.rc b/tests/functional/triggering/15-suicide/suite.rc similarity index 100% rename from tests/triggering/15-suicide/suite.rc rename to tests/functional/triggering/15-suicide/suite.rc diff --git a/tests/triggering/16-fam-expansion.t b/tests/functional/triggering/16-fam-expansion.t similarity index 100% rename from tests/triggering/16-fam-expansion.t rename to tests/functional/triggering/16-fam-expansion.t diff --git a/tests/triggering/17-suicide-multi.t b/tests/functional/triggering/17-suicide-multi.t similarity index 100% rename from tests/triggering/17-suicide-multi.t rename to tests/functional/triggering/17-suicide-multi.t diff --git a/tests/triggering/17-suicide-multi/reference.log b/tests/functional/triggering/17-suicide-multi/reference.log similarity index 100% rename from tests/triggering/17-suicide-multi/reference.log rename to tests/functional/triggering/17-suicide-multi/reference.log diff --git a/tests/triggering/17-suicide-multi/suite.rc b/tests/functional/triggering/17-suicide-multi/suite.rc similarity index 100% rename from tests/triggering/17-suicide-multi/suite.rc rename to tests/functional/triggering/17-suicide-multi/suite.rc diff --git a/tests/triggering/19-and-suicide.t b/tests/functional/triggering/19-and-suicide.t similarity index 100% rename from tests/triggering/19-and-suicide.t rename to tests/functional/triggering/19-and-suicide.t diff --git a/tests/triggering/19-and-suicide/reference.log b/tests/functional/triggering/19-and-suicide/reference.log similarity index 100% rename from tests/triggering/19-and-suicide/reference.log rename to tests/functional/triggering/19-and-suicide/reference.log diff --git a/tests/triggering/19-and-suicide/suite.rc b/tests/functional/triggering/19-and-suicide/suite.rc similarity index 100% rename from tests/triggering/19-and-suicide/suite.rc rename to tests/functional/triggering/19-and-suicide/suite.rc diff --git a/tests/triggering/20-and-outputs-suicide.t b/tests/functional/triggering/20-and-outputs-suicide.t similarity index 100% rename from tests/triggering/20-and-outputs-suicide.t rename to tests/functional/triggering/20-and-outputs-suicide.t diff --git a/tests/triggering/20-and-outputs-suicide/reference.log b/tests/functional/triggering/20-and-outputs-suicide/reference.log similarity index 100% rename from tests/triggering/20-and-outputs-suicide/reference.log rename to tests/functional/triggering/20-and-outputs-suicide/reference.log diff --git a/tests/triggering/20-and-outputs-suicide/suite.rc b/tests/functional/triggering/20-and-outputs-suicide/suite.rc similarity index 100% rename from tests/triggering/20-and-outputs-suicide/suite.rc rename to tests/functional/triggering/20-and-outputs-suicide/suite.rc diff --git a/tests/triggering/fam-expansion/suite.rc b/tests/functional/triggering/fam-expansion/suite.rc similarity index 100% rename from tests/triggering/fam-expansion/suite.rc rename to tests/functional/triggering/fam-expansion/suite.rc diff --git a/tests/triggering/test_header b/tests/functional/triggering/test_header similarity index 100% rename from tests/triggering/test_header rename to tests/functional/triggering/test_header diff --git a/tests/validate/00-multi.t b/tests/functional/validate/00-multi.t similarity index 100% rename from tests/validate/00-multi.t rename to tests/functional/validate/00-multi.t diff --git a/tests/validate/00-multi/reference.log b/tests/functional/validate/00-multi/reference.log similarity index 100% rename from tests/validate/00-multi/reference.log rename to tests/functional/validate/00-multi/reference.log diff --git a/tests/validate/00-multi/suite.rc b/tests/functional/validate/00-multi/suite.rc similarity index 100% rename from tests/validate/00-multi/suite.rc rename to tests/functional/validate/00-multi/suite.rc diff --git a/tests/validate/01-periodical.t b/tests/functional/validate/01-periodical.t similarity index 100% rename from tests/validate/01-periodical.t rename to tests/functional/validate/01-periodical.t diff --git a/tests/validate/01-periodical/reference.log b/tests/functional/validate/01-periodical/reference.log similarity index 100% rename from tests/validate/01-periodical/reference.log rename to tests/functional/validate/01-periodical/reference.log diff --git a/tests/validate/01-periodical/suite.rc b/tests/functional/validate/01-periodical/suite.rc similarity index 100% rename from tests/validate/01-periodical/suite.rc rename to tests/functional/validate/01-periodical/suite.rc diff --git a/tests/validate/02-scripting-quotes.t b/tests/functional/validate/02-scripting-quotes.t similarity index 100% rename from tests/validate/02-scripting-quotes.t rename to tests/functional/validate/02-scripting-quotes.t diff --git a/tests/validate/02-scripting-quotes/suite.rc b/tests/functional/validate/02-scripting-quotes/suite.rc similarity index 100% rename from tests/validate/02-scripting-quotes/suite.rc rename to tests/functional/validate/02-scripting-quotes/suite.rc diff --git a/tests/validate/03-incomplete-quotes.t b/tests/functional/validate/03-incomplete-quotes.t similarity index 100% rename from tests/validate/03-incomplete-quotes.t rename to tests/functional/validate/03-incomplete-quotes.t diff --git a/tests/validate/03-incomplete-quotes/suite.rc b/tests/functional/validate/03-incomplete-quotes/suite.rc similarity index 100% rename from tests/validate/03-incomplete-quotes/suite.rc rename to tests/functional/validate/03-incomplete-quotes/suite.rc diff --git a/tests/validate/05-strict-case.t b/tests/functional/validate/05-strict-case.t similarity index 100% rename from tests/validate/05-strict-case.t rename to tests/functional/validate/05-strict-case.t diff --git a/tests/validate/05-strict-case/suite.rc b/tests/functional/validate/05-strict-case/suite.rc similarity index 100% rename from tests/validate/05-strict-case/suite.rc rename to tests/functional/validate/05-strict-case/suite.rc diff --git a/tests/validate/06-strict-missing.t b/tests/functional/validate/06-strict-missing.t similarity index 100% rename from tests/validate/06-strict-missing.t rename to tests/functional/validate/06-strict-missing.t diff --git a/tests/validate/06-strict-missing/suite.rc b/tests/functional/validate/06-strict-missing/suite.rc similarity index 100% rename from tests/validate/06-strict-missing/suite.rc rename to tests/functional/validate/06-strict-missing/suite.rc diff --git a/tests/validate/07-null-parentage.t b/tests/functional/validate/07-null-parentage.t similarity index 100% rename from tests/validate/07-null-parentage.t rename to tests/functional/validate/07-null-parentage.t diff --git a/tests/validate/07-null-parentage/suite.rc b/tests/functional/validate/07-null-parentage/suite.rc similarity index 100% rename from tests/validate/07-null-parentage/suite.rc rename to tests/functional/validate/07-null-parentage/suite.rc diff --git a/tests/validate/08-whitespace.t b/tests/functional/validate/08-whitespace.t similarity index 100% rename from tests/validate/08-whitespace.t rename to tests/functional/validate/08-whitespace.t diff --git a/tests/validate/08-whitespace/inc.rc b/tests/functional/validate/08-whitespace/inc.rc similarity index 100% rename from tests/validate/08-whitespace/inc.rc rename to tests/functional/validate/08-whitespace/inc.rc diff --git a/tests/validate/08-whitespace/suite.rc b/tests/functional/validate/08-whitespace/suite.rc similarity index 100% rename from tests/validate/08-whitespace/suite.rc rename to tests/functional/validate/08-whitespace/suite.rc diff --git a/tests/validate/09-include-missing.t b/tests/functional/validate/09-include-missing.t similarity index 100% rename from tests/validate/09-include-missing.t rename to tests/functional/validate/09-include-missing.t diff --git a/tests/validate/10-bad-recurrence.t b/tests/functional/validate/10-bad-recurrence.t similarity index 100% rename from tests/validate/10-bad-recurrence.t rename to tests/functional/validate/10-bad-recurrence.t diff --git a/tests/validate/13-fail-old-syntax-2.t b/tests/functional/validate/13-fail-old-syntax-2.t similarity index 100% rename from tests/validate/13-fail-old-syntax-2.t rename to tests/functional/validate/13-fail-old-syntax-2.t diff --git a/tests/validate/13-fail-old-syntax-2/suite.rc b/tests/functional/validate/13-fail-old-syntax-2/suite.rc similarity index 100% rename from tests/validate/13-fail-old-syntax-2/suite.rc rename to tests/functional/validate/13-fail-old-syntax-2/suite.rc diff --git a/tests/validate/14-fail-old-syntax-3.t b/tests/functional/validate/14-fail-old-syntax-3.t similarity index 100% rename from tests/validate/14-fail-old-syntax-3.t rename to tests/functional/validate/14-fail-old-syntax-3.t diff --git a/tests/validate/14-fail-old-syntax-3/suite.rc b/tests/functional/validate/14-fail-old-syntax-3/suite.rc similarity index 100% rename from tests/validate/14-fail-old-syntax-3/suite.rc rename to tests/functional/validate/14-fail-old-syntax-3/suite.rc diff --git a/tests/validate/15-fail-old-syntax-4.t b/tests/functional/validate/15-fail-old-syntax-4.t similarity index 100% rename from tests/validate/15-fail-old-syntax-4.t rename to tests/functional/validate/15-fail-old-syntax-4.t diff --git a/tests/validate/15-fail-old-syntax-4/suite.rc b/tests/functional/validate/15-fail-old-syntax-4/suite.rc similarity index 100% rename from tests/validate/15-fail-old-syntax-4/suite.rc rename to tests/functional/validate/15-fail-old-syntax-4/suite.rc diff --git a/tests/validate/16-fail-old-syntax-5.t b/tests/functional/validate/16-fail-old-syntax-5.t similarity index 100% rename from tests/validate/16-fail-old-syntax-5.t rename to tests/functional/validate/16-fail-old-syntax-5.t diff --git a/tests/validate/16-fail-old-syntax-5/suite.rc b/tests/functional/validate/16-fail-old-syntax-5/suite.rc similarity index 100% rename from tests/validate/16-fail-old-syntax-5/suite.rc rename to tests/functional/validate/16-fail-old-syntax-5/suite.rc diff --git a/tests/validate/17-fail-old-syntax-6.t b/tests/functional/validate/17-fail-old-syntax-6.t similarity index 100% rename from tests/validate/17-fail-old-syntax-6.t rename to tests/functional/validate/17-fail-old-syntax-6.t diff --git a/tests/validate/18-fail-no-scheduling.t b/tests/functional/validate/18-fail-no-scheduling.t similarity index 100% rename from tests/validate/18-fail-no-scheduling.t rename to tests/functional/validate/18-fail-no-scheduling.t diff --git a/tests/validate/18-fail-no-scheduling/suite.rc b/tests/functional/validate/18-fail-no-scheduling/suite.rc similarity index 100% rename from tests/validate/18-fail-no-scheduling/suite.rc rename to tests/functional/validate/18-fail-no-scheduling/suite.rc diff --git a/tests/validate/19-fail-no-dependencies.t b/tests/functional/validate/19-fail-no-dependencies.t similarity index 100% rename from tests/validate/19-fail-no-dependencies.t rename to tests/functional/validate/19-fail-no-dependencies.t diff --git a/tests/validate/19-fail-no-dependencies/suite.rc b/tests/functional/validate/19-fail-no-dependencies/suite.rc similarity index 100% rename from tests/validate/19-fail-no-dependencies/suite.rc rename to tests/functional/validate/19-fail-no-dependencies/suite.rc diff --git a/tests/validate/20-fail-no-graph-async.t b/tests/functional/validate/20-fail-no-graph-async.t similarity index 100% rename from tests/validate/20-fail-no-graph-async.t rename to tests/functional/validate/20-fail-no-graph-async.t diff --git a/tests/validate/20-fail-no-graph-async/suite.rc b/tests/functional/validate/20-fail-no-graph-async/suite.rc similarity index 100% rename from tests/validate/20-fail-no-graph-async/suite.rc rename to tests/functional/validate/20-fail-no-graph-async/suite.rc diff --git a/tests/validate/21-fail-no-graph-sequence.t b/tests/functional/validate/21-fail-no-graph-sequence.t similarity index 100% rename from tests/validate/21-fail-no-graph-sequence.t rename to tests/functional/validate/21-fail-no-graph-sequence.t diff --git a/tests/validate/21-fail-no-graph-sequence/suite.rc b/tests/functional/validate/21-fail-no-graph-sequence/suite.rc similarity index 100% rename from tests/validate/21-fail-no-graph-sequence/suite.rc rename to tests/functional/validate/21-fail-no-graph-sequence/suite.rc diff --git a/tests/validate/22-fail-year-bounds.t b/tests/functional/validate/22-fail-year-bounds.t similarity index 100% rename from tests/validate/22-fail-year-bounds.t rename to tests/functional/validate/22-fail-year-bounds.t diff --git a/tests/validate/22-fail-year-bounds/suite.rc b/tests/functional/validate/22-fail-year-bounds/suite.rc similarity index 100% rename from tests/validate/22-fail-year-bounds/suite.rc rename to tests/functional/validate/22-fail-year-bounds/suite.rc diff --git a/tests/validate/23-fail-old-syntax-7.t b/tests/functional/validate/23-fail-old-syntax-7.t similarity index 100% rename from tests/validate/23-fail-old-syntax-7.t rename to tests/functional/validate/23-fail-old-syntax-7.t diff --git a/tests/validate/23-fail-old-syntax-7/suite.rc b/tests/functional/validate/23-fail-old-syntax-7/suite.rc similarity index 100% rename from tests/validate/23-fail-old-syntax-7/suite.rc rename to tests/functional/validate/23-fail-old-syntax-7/suite.rc diff --git a/tests/validate/24-fail-initial-greater-final.t b/tests/functional/validate/24-fail-initial-greater-final.t similarity index 100% rename from tests/validate/24-fail-initial-greater-final.t rename to tests/functional/validate/24-fail-initial-greater-final.t diff --git a/tests/validate/24-fail-initial-greater-final/suite.rc b/tests/functional/validate/24-fail-initial-greater-final/suite.rc similarity index 100% rename from tests/validate/24-fail-initial-greater-final/suite.rc rename to tests/functional/validate/24-fail-initial-greater-final/suite.rc diff --git a/tests/validate/25-fail-constrained-initial.t b/tests/functional/validate/25-fail-constrained-initial.t similarity index 100% rename from tests/validate/25-fail-constrained-initial.t rename to tests/functional/validate/25-fail-constrained-initial.t diff --git a/tests/validate/25-fail-constrained-initial/suite.rc b/tests/functional/validate/25-fail-constrained-initial/suite.rc similarity index 100% rename from tests/validate/25-fail-constrained-initial/suite.rc rename to tests/functional/validate/25-fail-constrained-initial/suite.rc diff --git a/tests/validate/26-fail-graph-double-conditionals.t b/tests/functional/validate/26-fail-graph-double-conditionals.t similarity index 100% rename from tests/validate/26-fail-graph-double-conditionals.t rename to tests/functional/validate/26-fail-graph-double-conditionals.t diff --git a/tests/validate/27-fail-constrained-final.t b/tests/functional/validate/27-fail-constrained-final.t similarity index 100% rename from tests/validate/27-fail-constrained-final.t rename to tests/functional/validate/27-fail-constrained-final.t diff --git a/tests/validate/27-fail-constrained-final/suite.rc b/tests/functional/validate/27-fail-constrained-final/suite.rc similarity index 100% rename from tests/validate/27-fail-constrained-final/suite.rc rename to tests/functional/validate/27-fail-constrained-final/suite.rc diff --git a/tests/validate/28-fail-max-active-cycle-points-zero.t b/tests/functional/validate/28-fail-max-active-cycle-points-zero.t similarity index 100% rename from tests/validate/28-fail-max-active-cycle-points-zero.t rename to tests/functional/validate/28-fail-max-active-cycle-points-zero.t diff --git a/tests/validate/28-fail-max-active-cycle-points-zero/suite.rc b/tests/functional/validate/28-fail-max-active-cycle-points-zero/suite.rc similarity index 100% rename from tests/validate/28-fail-max-active-cycle-points-zero/suite.rc rename to tests/functional/validate/28-fail-max-active-cycle-points-zero/suite.rc diff --git a/tests/validate/29-fail-graph-double-pipe/suite.rc b/tests/functional/validate/29-fail-graph-double-pipe/suite.rc similarity index 100% rename from tests/validate/29-fail-graph-double-pipe/suite.rc rename to tests/functional/validate/29-fail-graph-double-pipe/suite.rc diff --git a/tests/validate/29-pass-constrained-initial.t b/tests/functional/validate/29-pass-constrained-initial.t similarity index 100% rename from tests/validate/29-pass-constrained-initial.t rename to tests/functional/validate/29-pass-constrained-initial.t diff --git a/tests/validate/29-pass-constrained-initial/suite.rc b/tests/functional/validate/29-pass-constrained-initial/suite.rc similarity index 100% rename from tests/validate/29-pass-constrained-initial/suite.rc rename to tests/functional/validate/29-pass-constrained-initial/suite.rc diff --git a/tests/validate/30-pass-constrained-final.t b/tests/functional/validate/30-pass-constrained-final.t similarity index 100% rename from tests/validate/30-pass-constrained-final.t rename to tests/functional/validate/30-pass-constrained-final.t diff --git a/tests/validate/30-pass-constrained-final/suite.rc b/tests/functional/validate/30-pass-constrained-final/suite.rc similarity index 100% rename from tests/validate/30-pass-constrained-final/suite.rc rename to tests/functional/validate/30-pass-constrained-final/suite.rc diff --git a/tests/validate/31-fail-not-integer.t b/tests/functional/validate/31-fail-not-integer.t similarity index 100% rename from tests/validate/31-fail-not-integer.t rename to tests/functional/validate/31-fail-not-integer.t diff --git a/tests/validate/32-fail-graph-bracket-missing.t b/tests/functional/validate/32-fail-graph-bracket-missing.t similarity index 100% rename from tests/validate/32-fail-graph-bracket-missing.t rename to tests/functional/validate/32-fail-graph-bracket-missing.t diff --git a/tests/validate/32-fail-graph-bracket-missing/suite.rc b/tests/functional/validate/32-fail-graph-bracket-missing/suite.rc similarity index 100% rename from tests/validate/32-fail-graph-bracket-missing/suite.rc rename to tests/functional/validate/32-fail-graph-bracket-missing/suite.rc diff --git a/tests/validate/35-pass-special-tasks-non-word-names.t b/tests/functional/validate/35-pass-special-tasks-non-word-names.t similarity index 100% rename from tests/validate/35-pass-special-tasks-non-word-names.t rename to tests/functional/validate/35-pass-special-tasks-non-word-names.t diff --git a/tests/validate/36-fail-double-runahead.t b/tests/functional/validate/36-fail-double-runahead.t similarity index 100% rename from tests/validate/36-fail-double-runahead.t rename to tests/functional/validate/36-fail-double-runahead.t diff --git a/tests/validate/36-fail-double-runahead/suite.rc b/tests/functional/validate/36-fail-double-runahead/suite.rc similarity index 100% rename from tests/validate/36-fail-double-runahead/suite.rc rename to tests/functional/validate/36-fail-double-runahead/suite.rc diff --git a/tests/validate/37-clock-trigger-task-not-defined.t b/tests/functional/validate/37-clock-trigger-task-not-defined.t similarity index 100% rename from tests/validate/37-clock-trigger-task-not-defined.t rename to tests/functional/validate/37-clock-trigger-task-not-defined.t diff --git a/tests/validate/38-degenerate-point-format.t b/tests/functional/validate/38-degenerate-point-format.t similarity index 100% rename from tests/validate/38-degenerate-point-format.t rename to tests/functional/validate/38-degenerate-point-format.t diff --git a/tests/validate/38-degenerate-point-format/suite.rc b/tests/functional/validate/38-degenerate-point-format/suite.rc similarity index 100% rename from tests/validate/38-degenerate-point-format/suite.rc rename to tests/functional/validate/38-degenerate-point-format/suite.rc diff --git a/tests/validate/39-fail-suicide-left.t b/tests/functional/validate/39-fail-suicide-left.t similarity index 100% rename from tests/validate/39-fail-suicide-left.t rename to tests/functional/validate/39-fail-suicide-left.t diff --git a/tests/validate/40-jinja2-template-syntax-error-main.t b/tests/functional/validate/40-jinja2-template-syntax-error-main.t similarity index 100% rename from tests/validate/40-jinja2-template-syntax-error-main.t rename to tests/functional/validate/40-jinja2-template-syntax-error-main.t diff --git a/tests/validate/40-jinja2-template-syntax-error-main/suite.rc b/tests/functional/validate/40-jinja2-template-syntax-error-main/suite.rc similarity index 100% rename from tests/validate/40-jinja2-template-syntax-error-main/suite.rc rename to tests/functional/validate/40-jinja2-template-syntax-error-main/suite.rc diff --git a/tests/validate/41-jinja2-template-syntax-error-cylc-include.t b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include.t similarity index 100% rename from tests/validate/41-jinja2-template-syntax-error-cylc-include.t rename to tests/functional/validate/41-jinja2-template-syntax-error-cylc-include.t diff --git a/tests/validate/41-jinja2-template-syntax-error-cylc-include/suite-includeme.rc b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite-includeme.rc similarity index 100% rename from tests/validate/41-jinja2-template-syntax-error-cylc-include/suite-includeme.rc rename to tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite-includeme.rc diff --git a/tests/validate/41-jinja2-template-syntax-error-cylc-include/suite.rc b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite.rc similarity index 100% rename from tests/validate/41-jinja2-template-syntax-error-cylc-include/suite.rc rename to tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite.rc diff --git a/tests/validate/42-jinja2-template-syntax-error-jinja-include.t b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include.t similarity index 100% rename from tests/validate/42-jinja2-template-syntax-error-jinja-include.t rename to tests/functional/validate/42-jinja2-template-syntax-error-jinja-include.t diff --git a/tests/validate/42-jinja2-template-syntax-error-jinja-include/suite-includeme.rc b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite-includeme.rc similarity index 100% rename from tests/validate/42-jinja2-template-syntax-error-jinja-include/suite-includeme.rc rename to tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite-includeme.rc diff --git a/tests/validate/42-jinja2-template-syntax-error-jinja-include/suite.rc b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite.rc similarity index 100% rename from tests/validate/42-jinja2-template-syntax-error-jinja-include/suite.rc rename to tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite.rc diff --git a/tests/validate/43-jinja2-template-error-main.t b/tests/functional/validate/43-jinja2-template-error-main.t similarity index 100% rename from tests/validate/43-jinja2-template-error-main.t rename to tests/functional/validate/43-jinja2-template-error-main.t diff --git a/tests/validate/44-jinja2-template-not-found.t b/tests/functional/validate/44-jinja2-template-not-found.t similarity index 100% rename from tests/validate/44-jinja2-template-not-found.t rename to tests/functional/validate/44-jinja2-template-not-found.t diff --git a/tests/validate/44-jinja2-template-not-found/suite.rc b/tests/functional/validate/44-jinja2-template-not-found/suite.rc similarity index 100% rename from tests/validate/44-jinja2-template-not-found/suite.rc rename to tests/functional/validate/44-jinja2-template-not-found/suite.rc diff --git a/tests/validate/45-jinja2-type-error.t b/tests/functional/validate/45-jinja2-type-error.t similarity index 100% rename from tests/validate/45-jinja2-type-error.t rename to tests/functional/validate/45-jinja2-type-error.t diff --git a/tests/validate/46-fail-bad-vis-nod-attrs.t b/tests/functional/validate/46-fail-bad-vis-nod-attrs.t similarity index 100% rename from tests/validate/46-fail-bad-vis-nod-attrs.t rename to tests/functional/validate/46-fail-bad-vis-nod-attrs.t diff --git a/tests/validate/46-fail-bad-vis-nod-attrs/suite.rc b/tests/functional/validate/46-fail-bad-vis-nod-attrs/suite.rc similarity index 100% rename from tests/validate/46-fail-bad-vis-nod-attrs/suite.rc rename to tests/functional/validate/46-fail-bad-vis-nod-attrs/suite.rc diff --git a/tests/validate/47-fail-no-graph.t b/tests/functional/validate/47-fail-no-graph.t similarity index 100% rename from tests/validate/47-fail-no-graph.t rename to tests/functional/validate/47-fail-no-graph.t diff --git a/tests/validate/48-reg-then-pwd.t b/tests/functional/validate/48-reg-then-pwd.t similarity index 100% rename from tests/validate/48-reg-then-pwd.t rename to tests/functional/validate/48-reg-then-pwd.t diff --git a/tests/validate/49-jinja2-undefined-error.t b/tests/functional/validate/49-jinja2-undefined-error.t similarity index 100% rename from tests/validate/49-jinja2-undefined-error.t rename to tests/functional/validate/49-jinja2-undefined-error.t diff --git a/tests/validate/49-jinja2-undefined-error/suite.rc b/tests/functional/validate/49-jinja2-undefined-error/suite.rc similarity index 100% rename from tests/validate/49-jinja2-undefined-error/suite.rc rename to tests/functional/validate/49-jinja2-undefined-error/suite.rc diff --git a/tests/validate/50-hyphen-fam.t b/tests/functional/validate/50-hyphen-fam.t similarity index 100% rename from tests/validate/50-hyphen-fam.t rename to tests/functional/validate/50-hyphen-fam.t diff --git a/tests/validate/51-zero-interval.t b/tests/functional/validate/51-zero-interval.t similarity index 100% rename from tests/validate/51-zero-interval.t rename to tests/functional/validate/51-zero-interval.t diff --git a/tests/validate/52-null-timeout.t b/tests/functional/validate/52-null-timeout.t similarity index 100% rename from tests/validate/52-null-timeout.t rename to tests/functional/validate/52-null-timeout.t diff --git a/tests/validate/53-missing-parentage.t b/tests/functional/validate/53-missing-parentage.t similarity index 100% rename from tests/validate/53-missing-parentage.t rename to tests/functional/validate/53-missing-parentage.t diff --git a/tests/validate/53-missing-parentage/suite.rc b/tests/functional/validate/53-missing-parentage/suite.rc similarity index 100% rename from tests/validate/53-missing-parentage/suite.rc rename to tests/functional/validate/53-missing-parentage/suite.rc diff --git a/tests/validate/54-self-suicide.t b/tests/functional/validate/54-self-suicide.t similarity index 100% rename from tests/validate/54-self-suicide.t rename to tests/functional/validate/54-self-suicide.t diff --git a/tests/validate/54-self-suicide/suite.rc b/tests/functional/validate/54-self-suicide/suite.rc similarity index 100% rename from tests/validate/54-self-suicide/suite.rc rename to tests/functional/validate/54-self-suicide/suite.rc diff --git a/tests/validate/55-hyphen-finish.t b/tests/functional/validate/55-hyphen-finish.t similarity index 100% rename from tests/validate/55-hyphen-finish.t rename to tests/functional/validate/55-hyphen-finish.t diff --git a/tests/validate/56-succeed-sub.t b/tests/functional/validate/56-succeed-sub.t similarity index 100% rename from tests/validate/56-succeed-sub.t rename to tests/functional/validate/56-succeed-sub.t diff --git a/tests/validate/57-offset-no-offset.t b/tests/functional/validate/57-offset-no-offset.t similarity index 100% rename from tests/validate/57-offset-no-offset.t rename to tests/functional/validate/57-offset-no-offset.t diff --git a/tests/validate/58-icp-quoted-now.t b/tests/functional/validate/58-icp-quoted-now.t similarity index 100% rename from tests/validate/58-icp-quoted-now.t rename to tests/functional/validate/58-icp-quoted-now.t diff --git a/tests/validate/60-group.t b/tests/functional/validate/60-group.t similarity index 100% rename from tests/validate/60-group.t rename to tests/functional/validate/60-group.t diff --git a/tests/validate/60-group/suite.rc b/tests/functional/validate/60-group/suite.rc similarity index 100% rename from tests/validate/60-group/suite.rc rename to tests/functional/validate/60-group/suite.rc diff --git a/tests/validate/61-include-missing-quote.t b/tests/functional/validate/61-include-missing-quote.t similarity index 100% rename from tests/validate/61-include-missing-quote.t rename to tests/functional/validate/61-include-missing-quote.t diff --git a/tests/validate/62-null-task-name.t b/tests/functional/validate/62-null-task-name.t similarity index 100% rename from tests/validate/62-null-task-name.t rename to tests/functional/validate/62-null-task-name.t diff --git a/tests/validate/63-collapse-secondary-parent.t b/tests/functional/validate/63-collapse-secondary-parent.t similarity index 100% rename from tests/validate/63-collapse-secondary-parent.t rename to tests/functional/validate/63-collapse-secondary-parent.t diff --git a/tests/validate/64-circular.t b/tests/functional/validate/64-circular.t similarity index 100% rename from tests/validate/64-circular.t rename to tests/functional/validate/64-circular.t diff --git a/tests/validate/65-bad-task-event-handler-tmpl.t b/tests/functional/validate/65-bad-task-event-handler-tmpl.t similarity index 100% rename from tests/validate/65-bad-task-event-handler-tmpl.t rename to tests/functional/validate/65-bad-task-event-handler-tmpl.t diff --git a/tests/validate/66-fail-consec-spaces.t b/tests/functional/validate/66-fail-consec-spaces.t similarity index 100% rename from tests/validate/66-fail-consec-spaces.t rename to tests/functional/validate/66-fail-consec-spaces.t diff --git a/tests/validate/67-relative-icp.t b/tests/functional/validate/67-relative-icp.t similarity index 100% rename from tests/validate/67-relative-icp.t rename to tests/functional/validate/67-relative-icp.t diff --git a/tests/validate/68-trailing_whitespace.t b/tests/functional/validate/68-trailing_whitespace.t similarity index 100% rename from tests/validate/68-trailing_whitespace.t rename to tests/functional/validate/68-trailing_whitespace.t diff --git a/tests/validate/69-bare-clock-xtrigger.t b/tests/functional/validate/69-bare-clock-xtrigger.t similarity index 100% rename from tests/validate/69-bare-clock-xtrigger.t rename to tests/functional/validate/69-bare-clock-xtrigger.t diff --git a/tests/validate/69-task-proxy-sequence-bounds-err.t b/tests/functional/validate/69-task-proxy-sequence-bounds-err.t similarity index 100% rename from tests/validate/69-task-proxy-sequence-bounds-err.t rename to tests/functional/validate/69-task-proxy-sequence-bounds-err.t diff --git a/tests/validate/70-no-clock-int-cycle.t b/tests/functional/validate/70-no-clock-int-cycle.t similarity index 100% rename from tests/validate/70-no-clock-int-cycle.t rename to tests/functional/validate/70-no-clock-int-cycle.t diff --git a/tests/validate/71-platform-basic.t b/tests/functional/validate/71-platform-basic.t similarity index 100% rename from tests/validate/71-platform-basic.t rename to tests/functional/validate/71-platform-basic.t diff --git a/tests/validate/test_header b/tests/functional/validate/test_header similarity index 100% rename from tests/validate/test_header rename to tests/functional/validate/test_header diff --git a/tests/xtriggers/02-persistence.t b/tests/functional/xtriggers/02-persistence.t similarity index 100% rename from tests/xtriggers/02-persistence.t rename to tests/functional/xtriggers/02-persistence.t diff --git a/tests/xtriggers/02-persistence/faker_fail.py b/tests/functional/xtriggers/02-persistence/faker_fail.py similarity index 100% rename from tests/xtriggers/02-persistence/faker_fail.py rename to tests/functional/xtriggers/02-persistence/faker_fail.py diff --git a/tests/xtriggers/02-persistence/faker_succ.py b/tests/functional/xtriggers/02-persistence/faker_succ.py similarity index 100% rename from tests/xtriggers/02-persistence/faker_succ.py rename to tests/functional/xtriggers/02-persistence/faker_succ.py diff --git a/tests/xtriggers/02-persistence/suite.rc b/tests/functional/xtriggers/02-persistence/suite.rc similarity index 100% rename from tests/xtriggers/02-persistence/suite.rc rename to tests/functional/xtriggers/02-persistence/suite.rc diff --git a/tests/xtriggers/03-sequence.t b/tests/functional/xtriggers/03-sequence.t similarity index 100% rename from tests/xtriggers/03-sequence.t rename to tests/functional/xtriggers/03-sequence.t diff --git a/tests/xtriggers/test_header b/tests/functional/xtriggers/test_header similarity index 100% rename from tests/xtriggers/test_header rename to tests/functional/xtriggers/test_header diff --git a/tests/i b/tests/i new file mode 120000 index 00000000000..4a487a0b404 --- /dev/null +++ b/tests/i @@ -0,0 +1 @@ +integration/ \ No newline at end of file diff --git a/itests/README.md b/tests/integration/README.md similarity index 89% rename from itests/README.md rename to tests/integration/README.md index 0df69977418..40d5a1fefd5 100644 --- a/itests/README.md +++ b/tests/integration/README.md @@ -5,8 +5,8 @@ This directory contains Cylc integration tests. ## How To Run These Tests ```console -$ pytest itests/ -$ pytest itests/ -n 5 # run up to 5 tests in parallel +$ pytest tests/i +$ pytest tests/i -n 5 # run up to 5 tests in parallel ``` ## What Are Integration Tests @@ -39,4 +39,4 @@ Don't write functional tests here: Don't write unit tests here: * No testing of odd methods and functions. -* If it runs *really* quickly, its likely a unit test. +* If it runs *really* quickly, it's likely a unit test. diff --git a/itests/__init__.py b/tests/integration/__init__.py similarity index 100% rename from itests/__init__.py rename to tests/integration/__init__.py diff --git a/itests/conftest.py b/tests/integration/conftest.py similarity index 100% rename from itests/conftest.py rename to tests/integration/conftest.py diff --git a/itests/test_client.py b/tests/integration/test_client.py similarity index 100% rename from itests/test_client.py rename to tests/integration/test_client.py diff --git a/itests/test_data_store_mgr.py b/tests/integration/test_data_store_mgr.py similarity index 100% rename from itests/test_data_store_mgr.py rename to tests/integration/test_data_store_mgr.py diff --git a/itests/test_examples.py b/tests/integration/test_examples.py similarity index 100% rename from itests/test_examples.py rename to tests/integration/test_examples.py diff --git a/itests/test_framework.py b/tests/integration/test_framework.py similarity index 100% rename from itests/test_framework.py rename to tests/integration/test_framework.py diff --git a/itests/test_job_pool.py b/tests/integration/test_job_pool.py similarity index 100% rename from itests/test_job_pool.py rename to tests/integration/test_job_pool.py diff --git a/itests/test_publisher.py b/tests/integration/test_publisher.py similarity index 100% rename from itests/test_publisher.py rename to tests/integration/test_publisher.py diff --git a/itests/test_resolvers.py b/tests/integration/test_resolvers.py similarity index 100% rename from itests/test_resolvers.py rename to tests/integration/test_resolvers.py diff --git a/itests/test_server.py b/tests/integration/test_server.py similarity index 100% rename from itests/test_server.py rename to tests/integration/test_server.py diff --git a/itests/test_zmq.py b/tests/integration/test_zmq.py similarity index 100% rename from itests/test_zmq.py rename to tests/integration/test_zmq.py diff --git a/tests/u b/tests/u new file mode 120000 index 00000000000..9de05dea250 --- /dev/null +++ b/tests/u @@ -0,0 +1 @@ +unit/ \ No newline at end of file diff --git a/cylc/flow/tests/__init__.py b/tests/unit/__init__.py similarity index 100% rename from cylc/flow/tests/__init__.py rename to tests/unit/__init__.py diff --git a/cylc/flow/tests/batch_sys_handlers/test_loadleveler.py b/tests/unit/batch_sys_handlers/test_loadleveler.py similarity index 100% rename from cylc/flow/tests/batch_sys_handlers/test_loadleveler.py rename to tests/unit/batch_sys_handlers/test_loadleveler.py diff --git a/cylc/flow/tests/batch_sys_handlers/test_lsf.py b/tests/unit/batch_sys_handlers/test_lsf.py similarity index 100% rename from cylc/flow/tests/batch_sys_handlers/test_lsf.py rename to tests/unit/batch_sys_handlers/test_lsf.py diff --git a/cylc/flow/tests/batch_sys_handlers/test_moab.py b/tests/unit/batch_sys_handlers/test_moab.py similarity index 100% rename from cylc/flow/tests/batch_sys_handlers/test_moab.py rename to tests/unit/batch_sys_handlers/test_moab.py diff --git a/cylc/flow/tests/batch_sys_handlers/test_pbs.py b/tests/unit/batch_sys_handlers/test_pbs.py similarity index 100% rename from cylc/flow/tests/batch_sys_handlers/test_pbs.py rename to tests/unit/batch_sys_handlers/test_pbs.py diff --git a/cylc/flow/tests/batch_sys_handlers/test_slurm.py b/tests/unit/batch_sys_handlers/test_slurm.py similarity index 100% rename from cylc/flow/tests/batch_sys_handlers/test_slurm.py rename to tests/unit/batch_sys_handlers/test_slurm.py diff --git a/cylc/flow/tests/conftest.py b/tests/unit/conftest.py similarity index 100% rename from cylc/flow/tests/conftest.py rename to tests/unit/conftest.py diff --git a/cylc/flow/tests/cycling/__init__.py b/tests/unit/cycling/__init__.py similarity index 100% rename from cylc/flow/tests/cycling/__init__.py rename to tests/unit/cycling/__init__.py diff --git a/cylc/flow/tests/cycling/test_cycling.py b/tests/unit/cycling/test_cycling.py similarity index 100% rename from cylc/flow/tests/cycling/test_cycling.py rename to tests/unit/cycling/test_cycling.py diff --git a/cylc/flow/tests/cycling/test_integer.py b/tests/unit/cycling/test_integer.py similarity index 100% rename from cylc/flow/tests/cycling/test_integer.py rename to tests/unit/cycling/test_integer.py diff --git a/cylc/flow/tests/cycling/test_iso8601.py b/tests/unit/cycling/test_iso8601.py similarity index 100% rename from cylc/flow/tests/cycling/test_iso8601.py rename to tests/unit/cycling/test_iso8601.py diff --git a/cylc/flow/tests/cycling/test_util.py b/tests/unit/cycling/test_util.py similarity index 100% rename from cylc/flow/tests/cycling/test_util.py rename to tests/unit/cycling/test_util.py diff --git a/cylc/flow/tests/main_loop/auto_restart.py b/tests/unit/main_loop/auto_restart.py similarity index 100% rename from cylc/flow/tests/main_loop/auto_restart.py rename to tests/unit/main_loop/auto_restart.py diff --git a/cylc/flow/tests/main_loop/health_check.py b/tests/unit/main_loop/health_check.py similarity index 100% rename from cylc/flow/tests/main_loop/health_check.py rename to tests/unit/main_loop/health_check.py diff --git a/cylc/flow/tests/main_loop/log_data_store.py b/tests/unit/main_loop/log_data_store.py similarity index 100% rename from cylc/flow/tests/main_loop/log_data_store.py rename to tests/unit/main_loop/log_data_store.py diff --git a/cylc/flow/tests/main_loop/log_main_loop.py b/tests/unit/main_loop/log_main_loop.py similarity index 100% rename from cylc/flow/tests/main_loop/log_main_loop.py rename to tests/unit/main_loop/log_main_loop.py diff --git a/cylc/flow/tests/main_loop/log_memory.py b/tests/unit/main_loop/log_memory.py similarity index 100% rename from cylc/flow/tests/main_loop/log_memory.py rename to tests/unit/main_loop/log_memory.py diff --git a/cylc/flow/tests/main_loop/main_loop.py b/tests/unit/main_loop/main_loop.py similarity index 100% rename from cylc/flow/tests/main_loop/main_loop.py rename to tests/unit/main_loop/main_loop.py diff --git a/cylc/flow/tests/network/test_publisher.py b/tests/unit/network/test_publisher.py similarity index 100% rename from cylc/flow/tests/network/test_publisher.py rename to tests/unit/network/test_publisher.py diff --git a/cylc/flow/tests/network/test_scan.py b/tests/unit/network/test_scan.py similarity index 100% rename from cylc/flow/tests/network/test_scan.py rename to tests/unit/network/test_scan.py diff --git a/cylc/flow/tests/network/test_schema.py b/tests/unit/network/test_schema.py similarity index 100% rename from cylc/flow/tests/network/test_schema.py rename to tests/unit/network/test_schema.py diff --git a/cylc/flow/tests/network/test_subscriber.py b/tests/unit/network/test_subscriber.py similarity index 100% rename from cylc/flow/tests/network/test_subscriber.py rename to tests/unit/network/test_subscriber.py diff --git a/cylc/flow/tests/network/test_zmq.py b/tests/unit/network/test_zmq.py similarity index 100% rename from cylc/flow/tests/network/test_zmq.py rename to tests/unit/network/test_zmq.py diff --git a/cylc/flow/tests/option_parsers.py b/tests/unit/option_parsers.py similarity index 100% rename from cylc/flow/tests/option_parsers.py rename to tests/unit/option_parsers.py diff --git a/cylc/flow/tests/parsec/__init__.py b/tests/unit/parsec/__init__.py similarity index 100% rename from cylc/flow/tests/parsec/__init__.py rename to tests/unit/parsec/__init__.py diff --git a/cylc/flow/tests/parsec/test_config.py b/tests/unit/parsec/test_config.py similarity index 100% rename from cylc/flow/tests/parsec/test_config.py rename to tests/unit/parsec/test_config.py diff --git a/cylc/flow/tests/parsec/test_config_node.py b/tests/unit/parsec/test_config_node.py similarity index 100% rename from cylc/flow/tests/parsec/test_config_node.py rename to tests/unit/parsec/test_config_node.py diff --git a/cylc/flow/tests/parsec/test_dict_tree.py b/tests/unit/parsec/test_dict_tree.py similarity index 100% rename from cylc/flow/tests/parsec/test_dict_tree.py rename to tests/unit/parsec/test_dict_tree.py diff --git a/cylc/flow/tests/parsec/test_empysupport.py b/tests/unit/parsec/test_empysupport.py similarity index 100% rename from cylc/flow/tests/parsec/test_empysupport.py rename to tests/unit/parsec/test_empysupport.py diff --git a/cylc/flow/tests/parsec/test_fileparse.py b/tests/unit/parsec/test_fileparse.py similarity index 100% rename from cylc/flow/tests/parsec/test_fileparse.py rename to tests/unit/parsec/test_fileparse.py diff --git a/cylc/flow/tests/parsec/test_include.py b/tests/unit/parsec/test_include.py similarity index 100% rename from cylc/flow/tests/parsec/test_include.py rename to tests/unit/parsec/test_include.py diff --git a/cylc/flow/tests/parsec/test_jinja2support.py b/tests/unit/parsec/test_jinja2support.py similarity index 100% rename from cylc/flow/tests/parsec/test_jinja2support.py rename to tests/unit/parsec/test_jinja2support.py diff --git a/cylc/flow/tests/parsec/test_ordered_dict.py b/tests/unit/parsec/test_ordered_dict.py similarity index 100% rename from cylc/flow/tests/parsec/test_ordered_dict.py rename to tests/unit/parsec/test_ordered_dict.py diff --git a/cylc/flow/tests/parsec/test_parsec.py b/tests/unit/parsec/test_parsec.py similarity index 100% rename from cylc/flow/tests/parsec/test_parsec.py rename to tests/unit/parsec/test_parsec.py diff --git a/cylc/flow/tests/parsec/test_types.py b/tests/unit/parsec/test_types.py similarity index 100% rename from cylc/flow/tests/parsec/test_types.py rename to tests/unit/parsec/test_types.py diff --git a/cylc/flow/tests/parsec/test_upgrade.py b/tests/unit/parsec/test_upgrade.py similarity index 100% rename from cylc/flow/tests/parsec/test_upgrade.py rename to tests/unit/parsec/test_upgrade.py diff --git a/cylc/flow/tests/parsec/test_util.py b/tests/unit/parsec/test_util.py similarity index 100% rename from cylc/flow/tests/parsec/test_util.py rename to tests/unit/parsec/test_util.py diff --git a/cylc/flow/tests/parsec/test_validate.py b/tests/unit/parsec/test_validate.py similarity index 100% rename from cylc/flow/tests/parsec/test_validate.py rename to tests/unit/parsec/test_validate.py diff --git a/cylc/flow/tests/test_c3mro.py b/tests/unit/test_c3mro.py similarity index 100% rename from cylc/flow/tests/test_c3mro.py rename to tests/unit/test_c3mro.py diff --git a/cylc/flow/tests/test_conditional_simplifier.py b/tests/unit/test_conditional_simplifier.py similarity index 100% rename from cylc/flow/tests/test_conditional_simplifier.py rename to tests/unit/test_conditional_simplifier.py diff --git a/cylc/flow/tests/test_config.py b/tests/unit/test_config.py similarity index 100% rename from cylc/flow/tests/test_config.py rename to tests/unit/test_config.py diff --git a/cylc/flow/tests/test_config_upgrader.py b/tests/unit/test_config_upgrader.py similarity index 100% rename from cylc/flow/tests/test_config_upgrader.py rename to tests/unit/test_config_upgrader.py diff --git a/cylc/flow/tests/test_context_node.py b/tests/unit/test_context_node.py similarity index 100% rename from cylc/flow/tests/test_context_node.py rename to tests/unit/test_context_node.py diff --git a/cylc/flow/tests/test_cylc_subproc.py b/tests/unit/test_cylc_subproc.py similarity index 100% rename from cylc/flow/tests/test_cylc_subproc.py rename to tests/unit/test_cylc_subproc.py diff --git a/cylc/flow/tests/test_data_store_mgr.py b/tests/unit/test_data_store_mgr.py similarity index 100% rename from cylc/flow/tests/test_data_store_mgr.py rename to tests/unit/test_data_store_mgr.py diff --git a/cylc/flow/tests/test_exceptions.py b/tests/unit/test_exceptions.py similarity index 100% rename from cylc/flow/tests/test_exceptions.py rename to tests/unit/test_exceptions.py diff --git a/cylc/flow/tests/test_graph_parser.py b/tests/unit/test_graph_parser.py similarity index 100% rename from cylc/flow/tests/test_graph_parser.py rename to tests/unit/test_graph_parser.py diff --git a/cylc/flow/tests/test_host_select.py b/tests/unit/test_host_select.py similarity index 100% rename from cylc/flow/tests/test_host_select.py rename to tests/unit/test_host_select.py diff --git a/cylc/flow/tests/test_host_select_remote.py b/tests/unit/test_host_select_remote.py similarity index 100% rename from cylc/flow/tests/test_host_select_remote.py rename to tests/unit/test_host_select_remote.py diff --git a/cylc/flow/tests/test_hostuserutil.py b/tests/unit/test_hostuserutil.py similarity index 100% rename from cylc/flow/tests/test_hostuserutil.py rename to tests/unit/test_hostuserutil.py diff --git a/cylc/flow/tests/test_job_file.py b/tests/unit/test_job_file.py similarity index 100% rename from cylc/flow/tests/test_job_file.py rename to tests/unit/test_job_file.py diff --git a/cylc/flow/tests/test_loggingutil.py b/tests/unit/test_loggingutil.py similarity index 100% rename from cylc/flow/tests/test_loggingutil.py rename to tests/unit/test_loggingutil.py diff --git a/cylc/flow/tests/test_param_expand.py b/tests/unit/test_param_expand.py similarity index 100% rename from cylc/flow/tests/test_param_expand.py rename to tests/unit/test_param_expand.py diff --git a/cylc/flow/tests/test_pathutil.py b/tests/unit/test_pathutil.py similarity index 100% rename from cylc/flow/tests/test_pathutil.py rename to tests/unit/test_pathutil.py diff --git a/cylc/flow/tests/test_pbs_multi_cluster.py b/tests/unit/test_pbs_multi_cluster.py similarity index 100% rename from cylc/flow/tests/test_pbs_multi_cluster.py rename to tests/unit/test_pbs_multi_cluster.py diff --git a/cylc/flow/tests/test_platform_lookup.py b/tests/unit/test_platform_lookup.py similarity index 100% rename from cylc/flow/tests/test_platform_lookup.py rename to tests/unit/test_platform_lookup.py diff --git a/cylc/flow/tests/test_remote.py b/tests/unit/test_remote.py similarity index 100% rename from cylc/flow/tests/test_remote.py rename to tests/unit/test_remote.py diff --git a/cylc/flow/tests/test_resources.py b/tests/unit/test_resources.py similarity index 100% rename from cylc/flow/tests/test_resources.py rename to tests/unit/test_resources.py diff --git a/cylc/flow/tests/test_rundb.py b/tests/unit/test_rundb.py similarity index 100% rename from cylc/flow/tests/test_rundb.py rename to tests/unit/test_rundb.py diff --git a/cylc/flow/tests/test_subprocpool.py b/tests/unit/test_subprocpool.py similarity index 100% rename from cylc/flow/tests/test_subprocpool.py rename to tests/unit/test_subprocpool.py diff --git a/cylc/flow/tests/test_suite_files.py b/tests/unit/test_suite_files.py similarity index 100% rename from cylc/flow/tests/test_suite_files.py rename to tests/unit/test_suite_files.py diff --git a/cylc/flow/tests/test_task_events_mgr.py b/tests/unit/test_task_events_mgr.py similarity index 100% rename from cylc/flow/tests/test_task_events_mgr.py rename to tests/unit/test_task_events_mgr.py diff --git a/cylc/flow/tests/test_task_id.py b/tests/unit/test_task_id.py similarity index 100% rename from cylc/flow/tests/test_task_id.py rename to tests/unit/test_task_id.py diff --git a/cylc/flow/tests/test_task_outputs.py b/tests/unit/test_task_outputs.py similarity index 100% rename from cylc/flow/tests/test_task_outputs.py rename to tests/unit/test_task_outputs.py diff --git a/cylc/flow/tests/test_task_state.py b/tests/unit/test_task_state.py similarity index 100% rename from cylc/flow/tests/test_task_state.py rename to tests/unit/test_task_state.py diff --git a/cylc/flow/tests/test_task_state_prop.py b/tests/unit/test_task_state_prop.py similarity index 100% rename from cylc/flow/tests/test_task_state_prop.py rename to tests/unit/test_task_state_prop.py diff --git a/cylc/flow/tests/test_task_trigger.py b/tests/unit/test_task_trigger.py similarity index 100% rename from cylc/flow/tests/test_task_trigger.py rename to tests/unit/test_task_trigger.py diff --git a/cylc/flow/tests/test_templatevars.py b/tests/unit/test_templatevars.py similarity index 100% rename from cylc/flow/tests/test_templatevars.py rename to tests/unit/test_templatevars.py diff --git a/cylc/flow/tests/test_time_parser.py b/tests/unit/test_time_parser.py similarity index 100% rename from cylc/flow/tests/test_time_parser.py rename to tests/unit/test_time_parser.py diff --git a/cylc/flow/tests/test_wallclock.py b/tests/unit/test_wallclock.py similarity index 100% rename from cylc/flow/tests/test_wallclock.py rename to tests/unit/test_wallclock.py diff --git a/cylc/flow/tests/test_xtrigger_mgr.py b/tests/unit/test_xtrigger_mgr.py similarity index 100% rename from cylc/flow/tests/test_xtrigger_mgr.py rename to tests/unit/test_xtrigger_mgr.py diff --git a/cylc/flow/tests/tui/test_data.py b/tests/unit/tui/test_data.py similarity index 100% rename from cylc/flow/tests/tui/test_data.py rename to tests/unit/tui/test_data.py diff --git a/cylc/flow/tests/tui/test_overlay.py b/tests/unit/tui/test_overlay.py similarity index 100% rename from cylc/flow/tests/tui/test_overlay.py rename to tests/unit/tui/test_overlay.py diff --git a/cylc/flow/tests/tui/test_util.py b/tests/unit/tui/test_util.py similarity index 100% rename from cylc/flow/tests/tui/test_util.py rename to tests/unit/tui/test_util.py