diff --git a/.github/workflows/bats-hub.yml b/.github/workflows/bats-hub.yml
index bfbd6f054..2336b67f5 100644
--- a/.github/workflows/bats-hub.yml
+++ b/.github/workflows/bats-hub.yml
@@ -67,7 +67,7 @@ jobs:
       run: make bats-test-hub
 
     - name: "Collect hub coverage"
-      run: ./tests/bin/collect-hub-coverage >> $GITHUB_ENV
+      run: ./test/bin/collect-hub-coverage >> $GITHUB_ENV
 
     - name: "Create Parsers badge"
       uses: schneegans/dynamic-badges-action@v1.6.0
diff --git a/.github/workflows/bats-mysql.yml b/.github/workflows/bats-mysql.yml
index 6b785fcdc..db69c8800 100644
--- a/.github/workflows/bats-mysql.yml
+++ b/.github/workflows/bats-mysql.yml
@@ -90,10 +90,10 @@ jobs:
     # In case you need to inspect the database status after the failure of a given test
     #
     # - name: "Run specified tests"
-    #   run: ./tests/run-tests tests/bats/<filename>.bats -f "<test name>"
+    #   run: ./test/run-tests test/bats/<filename>.bats -f "<test name>"
 
     - name: Show database dump
-      run: ./tests/instance-db dump /dev/fd/1
+      run: ./test/instance-db dump /dev/fd/1
       env:
         DB_BACKEND: mysql
         MYSQL_HOST: 127.0.0.1
@@ -107,7 +107,7 @@ jobs:
       if: ${{ always() }}
 
     - name: "Show crowdsec logs"
-      run: for file in $(find ./tests/local/var/log -type f); do echo ">>>>> $file"; cat $file; echo; done
+      run: for file in $(find ./test/local/var/log -type f); do echo ">>>>> $file"; cat $file; echo; done
       if: ${{ always() }}
 
     - name: "Show database logs"
diff --git a/.github/workflows/bats-postgres.yml b/.github/workflows/bats-postgres.yml
index 488a143cf..60c16cb3c 100644
--- a/.github/workflows/bats-postgres.yml
+++ b/.github/workflows/bats-postgres.yml
@@ -110,7 +110,7 @@ jobs:
       if: ${{ always() }}
 
     - name: "Show crowdsec logs"
-      run: for file in $(find ./tests/local/var/log -type f); do echo ">>>>> $file"; cat $file; echo; done
+      run: for file in $(find ./test/local/var/log -type f); do echo ">>>>> $file"; cat $file; echo; done
       if: ${{ always() }}
 
     - name: "Show database logs"
diff --git a/.github/workflows/bats-sqlite-coverage.yml b/.github/workflows/bats-sqlite-coverage.yml
index 72a931a81..634cfffab 100644
--- a/.github/workflows/bats-sqlite-coverage.yml
+++ b/.github/workflows/bats-sqlite-coverage.yml
@@ -69,12 +69,12 @@ jobs:
     # In case you need to inspect the database status after the failure of a given test
     #
     # - name: "Run specified tests"
-    #   run: ./tests/run-tests tests/bats/<filename>.bats -f "<test name>"
+    #   run: ./test/run-tests test/bats/<filename>.bats -f "<test name>"
 
     - name: "Show database dump"
       run: |
-        ./tests/instance-crowdsec stop
-        sqlite3 ./tests/local/var/lib/crowdsec/data/crowdsec.db '.dump'
+        ./test/instance-crowdsec stop
+        sqlite3 ./test/local/var/lib/crowdsec/data/crowdsec.db '.dump'
       if: ${{ always() }}
 
     - name: "Show stack traces"
@@ -82,17 +82,17 @@ jobs:
       if: ${{ always() }}
 
     - name: "Show crowdsec logs"
-      run: for file in $(find ./tests/local/var/log -type f); do echo ">>>>> $file"; cat $file; echo; done
+      run: for file in $(find ./test/local/var/log -type f); do echo ">>>>> $file"; cat $file; echo; done
       if: ${{ always() }}
 
     - name: Upload crowdsec coverage to codecov
       uses: codecov/codecov-action@v3
       with:
-        files: ./tests/local/var/lib/coverage/coverage-crowdsec.out
+        files: ./test/local/var/lib/coverage/coverage-crowdsec.out
         flags: func-crowdsec
 
     - name: Upload cscli coverage to codecov
       uses: codecov/codecov-action@v3
       with:
-        files: ./tests/local/var/lib/coverage/coverage-cscli.out
+        files: ./test/local/var/lib/coverage/coverage-cscli.out
         flags: func-cscli
diff --git a/.gitmodules b/.gitmodules
index 0bf1bf5ef..6a170946b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,16 @@
 [submodule "tests/lib/bats-core"]
-	path = tests/lib/bats-core
+	path = test/lib/bats-core
 	url = https://github.com/crowdsecurity/bats-core.git
         branch = v1.7.0
 [submodule "tests/lib/bats-file"]
-	path = tests/lib/bats-file
+	path = test/lib/bats-file
 	url = https://github.com/crowdsecurity/bats-file.git
 [submodule "tests/lib/bats-assert"]
-	path = tests/lib/bats-assert
+	path = test/lib/bats-assert
 	url = https://github.com/crowdsecurity/bats-assert.git
 [submodule "tests/lib/bats-support"]
-	path = tests/lib/bats-support
+	path = test/lib/bats-support
 	url = https://github.com/crowdsecurity/bats-support.git
 [submodule "tests/lib/bats-mock"]
-	path = tests/lib/bats-mock
+	path = test/lib/bats-mock
 	url = https://github.com/crowdsecurity/bats-mock.git
diff --git a/Makefile b/Makefile
index 763f0ba33..f0d4dc415 100644
--- a/Makefile
+++ b/Makefile
@@ -159,11 +159,11 @@ test: goversion
 
 .PHONY: localstack
 localstack:
-	docker-compose -f tests/localstack/docker-compose.yml up
+	docker-compose -f test/localstack/docker-compose.yml up
 
 .PHONY: localstack-stop
 localstack-stop:
-	docker-compose -f tests/localstack/docker-compose.yml down
+	docker-compose -f test/localstack/docker-compose.yml down
 
 package-common:
 	@echo "Building Release to dir $(RELDIR)"
@@ -215,11 +215,11 @@ windows_installer: build
 chocolatey: windows_installer
 	@.\make_chocolatey.ps1 -version $(BUILD_VERSION)
 
-# Include tests/bats.mk only if it exists
+# Include test/bats.mk only if it exists
 # to allow building without a test/ directory
 # (i.e. inside docker)
-ifeq (,$(wildcard tests/bats.mk))
+ifeq (,$(wildcard test/bats.mk))
 bats-clean:
 else
-include tests/bats.mk
+include test/bats.mk
 endif
diff --git a/tests/.gitignore b/test/.gitignore
similarity index 100%
rename from tests/.gitignore
rename to test/.gitignore
diff --git a/tests/README.md b/test/README.md
similarity index 97%
rename from tests/README.md
rename to test/README.md
index 018ca71cd..bbc40a388 100644
--- a/tests/README.md
+++ b/test/README.md
@@ -77,10 +77,10 @@ To repeat test runs without rebuilding crowdsec, use `make bats-test`.
 
 ## Debugging tests
 
-See `./tests/run-tests --help` to run/debug specific tests.
+See `./test/run-tests --help` to run/debug specific tests.
 
-Example: `./tests/run-tests tests/bats/02_nolapi.bats -f "cscli config backup"` (the string is a regexp).
-You need to provide a path for a test file or directory (even if it's the full 'tests/bats') to use the `-f` option.
+Example: `./test/run-tests test/bats/02_nolapi.bats -f "cscli config backup"` (the string is a regexp).
+You need to provide a path for a test file or directory (even if it's the full 'test/bats') to use the `-f` option.
 
 
 # How does it work?
@@ -218,7 +218,7 @@ This doesn't mean you can't do that, just that you're on your own if the is an e
 
 For the purpose of functional tests, crowdsec and its companions (cscli, plugin
 notifiers, bouncers) are installed in a local environment, which means tests
-should not install or touch anything outside a `./tests/local` directory. This
+should not install or touch anything outside a `./test/local` directory. This
 includes binaries, configuration files, databases, data downloaded from
 internet, logs... The use of `/tmp` is tolerated, but BATS also provides [three
 useful
@@ -401,8 +401,8 @@ A mysql-client package is required as well.
 ## troubleshooting
 
  - CAPI is disabled, why?
-Most tests don't need it. Helper scripts are provided in `tests/enable-capi`
-and `tests/disable-capi` for interactive use, and two library functions
+Most tests don't need it. Helper scripts are provided in `test/enable-capi`
+and `test/disable-capi` for interactive use, and two library functions
 `config_enable_capi` and `config_disable_capi` to call inside the tests.
 You still need to call `cscli capi register` after enabling it.
 
diff --git a/tests/ansible/.gitignore b/test/ansible/.gitignore
similarity index 100%
rename from tests/ansible/.gitignore
rename to test/ansible/.gitignore
diff --git a/tests/ansible/README.md b/test/ansible/README.md
similarity index 100%
rename from tests/ansible/README.md
rename to test/ansible/README.md
diff --git a/tests/ansible/ansible.cfg b/test/ansible/ansible.cfg
similarity index 100%
rename from tests/ansible/ansible.cfg
rename to test/ansible/ansible.cfg
diff --git a/tests/ansible/debug_tools.yml b/test/ansible/debug_tools.yml
similarity index 100%
rename from tests/ansible/debug_tools.yml
rename to test/ansible/debug_tools.yml
diff --git a/tests/ansible/env/example.sh b/test/ansible/env/example.sh
similarity index 100%
rename from tests/ansible/env/example.sh
rename to test/ansible/env/example.sh
diff --git a/tests/ansible/env/pkg-sqlite.sh b/test/ansible/env/pkg-sqlite.sh
similarity index 100%
rename from tests/ansible/env/pkg-sqlite.sh
rename to test/ansible/env/pkg-sqlite.sh
diff --git a/tests/ansible/env/source-mysql.sh b/test/ansible/env/source-mysql.sh
similarity index 100%
rename from tests/ansible/env/source-mysql.sh
rename to test/ansible/env/source-mysql.sh
diff --git a/tests/ansible/env/source-pgx.sh b/test/ansible/env/source-pgx.sh
similarity index 100%
rename from tests/ansible/env/source-pgx.sh
rename to test/ansible/env/source-pgx.sh
diff --git a/tests/ansible/env/source-postgres.sh b/test/ansible/env/source-postgres.sh
similarity index 100%
rename from tests/ansible/env/source-postgres.sh
rename to test/ansible/env/source-postgres.sh
diff --git a/tests/ansible/env/source-sqlite.sh b/test/ansible/env/source-sqlite.sh
similarity index 100%
rename from tests/ansible/env/source-sqlite.sh
rename to test/ansible/env/source-sqlite.sh
diff --git a/tests/ansible/install_binary_package.yml b/test/ansible/install_binary_package.yml
similarity index 100%
rename from tests/ansible/install_binary_package.yml
rename to test/ansible/install_binary_package.yml
diff --git a/tests/ansible/prepare-run b/test/ansible/prepare-run
similarity index 100%
rename from tests/ansible/prepare-run
rename to test/ansible/prepare-run
diff --git a/tests/ansible/prepare_tests.yml b/test/ansible/prepare_tests.yml
similarity index 100%
rename from tests/ansible/prepare_tests.yml
rename to test/ansible/prepare_tests.yml
diff --git a/tests/ansible/provision_dependencies.yml b/test/ansible/provision_dependencies.yml
similarity index 100%
rename from tests/ansible/provision_dependencies.yml
rename to test/ansible/provision_dependencies.yml
diff --git a/tests/ansible/provision_test_suite.yml b/test/ansible/provision_test_suite.yml
similarity index 90%
rename from tests/ansible/provision_test_suite.yml
rename to test/ansible/provision_test_suite.yml
index fa335d008..a83c43564 100644
--- a/tests/ansible/provision_test_suite.yml
+++ b/test/ansible/provision_test_suite.yml
@@ -15,10 +15,10 @@
         name: crowdsecurity.testing.extract_sources_from_zip
       when: sources_zip | length > 0
 
-    - name: "Create crowdsec tests/local dir"
+    - name: "Create crowdsec test/local dir"
       become: false
       ansible.builtin.file:
-        path: "{{ ansible_env.HOME }}/crowdsec/tests/local"
+        path: "{{ ansible_env.HOME }}/crowdsec/test/local"
         state: directory
         mode: 0o755
 
diff --git a/tests/ansible/requirements.yml b/test/ansible/requirements.yml
similarity index 100%
rename from tests/ansible/requirements.yml
rename to test/ansible/requirements.yml
diff --git a/tests/ansible/roles/make_fixture/tasks/main.yml b/test/ansible/roles/make_fixture/tasks/main.yml
similarity index 88%
rename from tests/ansible/roles/make_fixture/tasks/main.yml
rename to test/ansible/roles/make_fixture/tasks/main.yml
index 77e8611f9..39f3e1785 100644
--- a/tests/ansible/roles/make_fixture/tasks/main.yml
+++ b/test/ansible/roles/make_fixture/tasks/main.yml
@@ -19,7 +19,7 @@
       ansible.builtin.command:
         cmd: "{{ make_cmd }} bats-build bats-fixture"
         chdir: "{{ ansible_env.HOME }}/crowdsec"
-        creates: "{{ ansible_env.HOME }}/crowdsec/tests/local-init/init-config-data.tar"
+        creates: "{{ ansible_env.HOME }}/crowdsec/test/local-init/init-config-data.tar"
       environment:
         DB_BACKEND: "{{ lookup('ansible.builtin.env', 'DB_BACKEND') }}"
         # daemonize -> /usr/bin or /usr/local/sbin
@@ -29,7 +29,7 @@
   rescue:
     - name: "Read crowdsec.log"
       ansible.builtin.slurp:
-        path: "{{ ansible_env.HOME }}/crowdsec/tests/local/var/log/crowdsec.log"
+        path: "{{ ansible_env.HOME }}/crowdsec/test/local/var/log/crowdsec.log"
       register: crowdsec_log
     - name: "Show crowdsec.log"
       ansible.builtin.fail:
@@ -43,7 +43,7 @@
       ansible.builtin.command:
         cmd: "{{ make_cmd }} bats-environment bats-check-requirements bats-fixture"
         chdir: "{{ ansible_env.HOME }}/crowdsec"
-        creates: "{{ ansible_env.HOME }}/crowdsec/tests/local-init/init-config-data.tar"
+        creates: "{{ ansible_env.HOME }}/crowdsec/test/local-init/init-config-data.tar"
       environment:
         PACKAGE_TESTING: "{{ package_testing }}"
         DB_BACKEND: "{{ lookup('ansible.builtin.env', 'DB_BACKEND') }}"
@@ -66,7 +66,7 @@
   block:
     - name: "Look for .environment.sh"
       ansible.builtin.slurp:
-        src: "{{ ansible_env.HOME }}/crowdsec/tests/.environment.sh"
+        src: "{{ ansible_env.HOME }}/crowdsec/test/.environment.sh"
       changed_when: true
       register: envfile
     - name: "Show .environment.sh"
diff --git a/tests/ansible/roles/make_fixture/vars/main.yml b/test/ansible/roles/make_fixture/vars/main.yml
similarity index 100%
rename from tests/ansible/roles/make_fixture/vars/main.yml
rename to test/ansible/roles/make_fixture/vars/main.yml
diff --git a/tests/ansible/roles/run_func_tests/tasks/main.yml b/test/ansible/roles/run_func_tests/tasks/main.yml
similarity index 91%
rename from tests/ansible/roles/run_func_tests/tasks/main.yml
rename to test/ansible/roles/run_func_tests/tasks/main.yml
index 741292f1e..324b90cb7 100644
--- a/tests/ansible/roles/run_func_tests/tasks/main.yml
+++ b/test/ansible/roles/run_func_tests/tasks/main.yml
@@ -31,7 +31,7 @@
   block:
     - name: "Look for .environment.sh"
       ansible.builtin.slurp:
-        src: "{{ ansible_env.HOME }}/crowdsec/tests/.environment.sh"
+        src: "{{ ansible_env.HOME }}/crowdsec/test/.environment.sh"
       changed_when: true
       register: envfile
     - name: "Show .environment.sh"
@@ -41,7 +41,7 @@
 - name: "Search for test scripts"
   become: false
   ansible.builtin.find:
-    paths: "{{ ansible_env.HOME }}/crowdsec/tests/bats"
+    paths: "{{ ansible_env.HOME }}/crowdsec/test/bats"
     pattern: "*.bats"
   register: testfiles
 
@@ -50,7 +50,7 @@
   block:
     - name: "Run test scripts"
       ansible.builtin.command:
-        cmd: tests/run-tests {{ item.path }}
+        cmd: test/run-tests {{ item.path }}
         chdir: "{{ ansible_env.HOME }}/crowdsec"
       with_items: "{{ testfiles.files | sort(attribute='path') }}"
       loop_control:
@@ -66,7 +66,7 @@
   rescue:
     - name: "Read crowdsec.log"
       ansible.builtin.slurp:
-        path: "{{ ansible_env.HOME }}/crowdsec/tests/local/var/log/crowdsec.log"
+        path: "{{ ansible_env.HOME }}/crowdsec/test/local/var/log/crowdsec.log"
       register: crowdsec_log
     - name: "Show crowdsec.log"
       ansible.builtin.fail:
@@ -79,7 +79,7 @@
   block:
     - name: "Run test scripts"
       ansible.builtin.command:
-        cmd: tests/run-tests {{ item.path }}
+        cmd: test/run-tests {{ item.path }}
         chdir: "{{ ansible_env.HOME }}/crowdsec"
       with_items: "{{ testfiles.files | sort(attribute='path') }}"
       loop_control:
diff --git a/tests/ansible/roles/run_func_tests/vars/main.yml b/test/ansible/roles/run_func_tests/vars/main.yml
similarity index 100%
rename from tests/ansible/roles/run_func_tests/vars/main.yml
rename to test/ansible/roles/run_func_tests/vars/main.yml
diff --git a/tests/ansible/run_all.yml b/test/ansible/run_all.yml
similarity index 100%
rename from tests/ansible/run_all.yml
rename to test/ansible/run_all.yml
diff --git a/tests/ansible/run_tests.yml b/test/ansible/run_tests.yml
similarity index 100%
rename from tests/ansible/run_tests.yml
rename to test/ansible/run_tests.yml
diff --git a/tests/ansible/run_wizard_tests.yml b/test/ansible/run_wizard_tests.yml
similarity index 83%
rename from tests/ansible/run_wizard_tests.yml
rename to test/ansible/run_wizard_tests.yml
index f6d5dae3d..fe2e9d635 100644
--- a/tests/ansible/run_wizard_tests.yml
+++ b/test/ansible/run_wizard_tests.yml
@@ -12,4 +12,4 @@
       become: true
       ansible.builtin.command:
         chdir: "/home/{{ ansible_user }}"
-        cmd: "./crowdsec/tests/run-tests crowdsec/tests/bats-detect"
+        cmd: "./crowdsec/test/run-tests crowdsec/test/bats-detect"
diff --git a/tests/ansible/vagrant/alma-8/Vagrantfile b/test/ansible/vagrant/alma-8/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/alma-8/Vagrantfile
rename to test/ansible/vagrant/alma-8/Vagrantfile
diff --git a/tests/ansible/vagrant/alma-9/Vagrantfile b/test/ansible/vagrant/alma-9/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/alma-9/Vagrantfile
rename to test/ansible/vagrant/alma-9/Vagrantfile
diff --git a/tests/ansible/vagrant/centos-7/Vagrantfile b/test/ansible/vagrant/centos-7/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/centos-7/Vagrantfile
rename to test/ansible/vagrant/centos-7/Vagrantfile
diff --git a/tests/ansible/vagrant/centos-7/skip b/test/ansible/vagrant/centos-7/skip
similarity index 100%
rename from tests/ansible/vagrant/centos-7/skip
rename to test/ansible/vagrant/centos-7/skip
diff --git a/tests/ansible/vagrant/centos-8/Vagrantfile b/test/ansible/vagrant/centos-8/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/centos-8/Vagrantfile
rename to test/ansible/vagrant/centos-8/Vagrantfile
diff --git a/tests/ansible/vagrant/centos-9/Vagrantfile b/test/ansible/vagrant/centos-9/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/centos-9/Vagrantfile
rename to test/ansible/vagrant/centos-9/Vagrantfile
diff --git a/tests/ansible/vagrant/common b/test/ansible/vagrant/common
similarity index 100%
rename from tests/ansible/vagrant/common
rename to test/ansible/vagrant/common
diff --git a/tests/ansible/vagrant/debian-10-buster/Vagrantfile b/test/ansible/vagrant/debian-10-buster/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/debian-10-buster/Vagrantfile
rename to test/ansible/vagrant/debian-10-buster/Vagrantfile
diff --git a/tests/ansible/vagrant/debian-11-bullseye/Vagrantfile b/test/ansible/vagrant/debian-11-bullseye/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/debian-11-bullseye/Vagrantfile
rename to test/ansible/vagrant/debian-11-bullseye/Vagrantfile
diff --git a/tests/ansible/vagrant/debian-9-stretch/Vagrantfile b/test/ansible/vagrant/debian-9-stretch/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/debian-9-stretch/Vagrantfile
rename to test/ansible/vagrant/debian-9-stretch/Vagrantfile
diff --git a/tests/ansible/vagrant/debian-9-stretch/skip b/test/ansible/vagrant/debian-9-stretch/skip
similarity index 100%
rename from tests/ansible/vagrant/debian-9-stretch/skip
rename to test/ansible/vagrant/debian-9-stretch/skip
diff --git a/tests/ansible/vagrant/debian-testing/Vagrantfile b/test/ansible/vagrant/debian-testing/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/debian-testing/Vagrantfile
rename to test/ansible/vagrant/debian-testing/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/alpine-3.16/Vagrantfile b/test/ansible/vagrant/experimental/alpine-3.16/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/alpine-3.16/Vagrantfile
rename to test/ansible/vagrant/experimental/alpine-3.16/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/alpine-3.16/bootstrap b/test/ansible/vagrant/experimental/alpine-3.16/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/experimental/alpine-3.16/bootstrap
rename to test/ansible/vagrant/experimental/alpine-3.16/bootstrap
diff --git a/tests/ansible/vagrant/experimental/alpine-3.16/skip b/test/ansible/vagrant/experimental/alpine-3.16/skip
similarity index 100%
rename from tests/ansible/vagrant/experimental/alpine-3.16/skip
rename to test/ansible/vagrant/experimental/alpine-3.16/skip
diff --git a/tests/ansible/vagrant/experimental/amazon-linux-2/Vagrantfile b/test/ansible/vagrant/experimental/amazon-linux-2/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/amazon-linux-2/Vagrantfile
rename to test/ansible/vagrant/experimental/amazon-linux-2/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/amazon-linux-2/issues.txt b/test/ansible/vagrant/experimental/amazon-linux-2/issues.txt
similarity index 100%
rename from tests/ansible/vagrant/experimental/amazon-linux-2/issues.txt
rename to test/ansible/vagrant/experimental/amazon-linux-2/issues.txt
diff --git a/tests/ansible/vagrant/experimental/arch/Vagrantfile b/test/ansible/vagrant/experimental/arch/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/arch/Vagrantfile
rename to test/ansible/vagrant/experimental/arch/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/devuan-3/Vagrantfile b/test/ansible/vagrant/experimental/devuan-3/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/devuan-3/Vagrantfile
rename to test/ansible/vagrant/experimental/devuan-3/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/devuan-3/skip b/test/ansible/vagrant/experimental/devuan-3/skip
similarity index 100%
rename from tests/ansible/vagrant/experimental/devuan-3/skip
rename to test/ansible/vagrant/experimental/devuan-3/skip
diff --git a/tests/ansible/vagrant/experimental/dragonflybsd-6/Vagrantfile b/test/ansible/vagrant/experimental/dragonflybsd-6/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/dragonflybsd-6/Vagrantfile
rename to test/ansible/vagrant/experimental/dragonflybsd-6/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/gentoo/Vagrantfile b/test/ansible/vagrant/experimental/gentoo/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/gentoo/Vagrantfile
rename to test/ansible/vagrant/experimental/gentoo/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/gentoo/bootstrap b/test/ansible/vagrant/experimental/gentoo/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/experimental/gentoo/bootstrap
rename to test/ansible/vagrant/experimental/gentoo/bootstrap
diff --git a/tests/ansible/vagrant/experimental/hardenedbsd-13/Vagrantfile b/test/ansible/vagrant/experimental/hardenedbsd-13/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/hardenedbsd-13/Vagrantfile
rename to test/ansible/vagrant/experimental/hardenedbsd-13/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/hardenedbsd-13/bootstrap b/test/ansible/vagrant/experimental/hardenedbsd-13/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/experimental/hardenedbsd-13/bootstrap
rename to test/ansible/vagrant/experimental/hardenedbsd-13/bootstrap
diff --git a/tests/ansible/vagrant/experimental/hardenedbsd-13/skip b/test/ansible/vagrant/experimental/hardenedbsd-13/skip
similarity index 100%
rename from tests/ansible/vagrant/experimental/hardenedbsd-13/skip
rename to test/ansible/vagrant/experimental/hardenedbsd-13/skip
diff --git a/tests/ansible/vagrant/experimental/netbsd-9/Vagrantfile b/test/ansible/vagrant/experimental/netbsd-9/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/netbsd-9/Vagrantfile
rename to test/ansible/vagrant/experimental/netbsd-9/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/openbsd-7/Vagrantfile b/test/ansible/vagrant/experimental/openbsd-7/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/openbsd-7/Vagrantfile
rename to test/ansible/vagrant/experimental/openbsd-7/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/openbsd-7/bootstrap b/test/ansible/vagrant/experimental/openbsd-7/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/experimental/openbsd-7/bootstrap
rename to test/ansible/vagrant/experimental/openbsd-7/bootstrap
diff --git a/tests/ansible/vagrant/experimental/openbsd-7/skip b/test/ansible/vagrant/experimental/openbsd-7/skip
similarity index 100%
rename from tests/ansible/vagrant/experimental/openbsd-7/skip
rename to test/ansible/vagrant/experimental/openbsd-7/skip
diff --git a/tests/ansible/vagrant/experimental/opensuse-15.4/Vagrantfile b/test/ansible/vagrant/experimental/opensuse-15.4/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/opensuse-15.4/Vagrantfile
rename to test/ansible/vagrant/experimental/opensuse-15.4/Vagrantfile
diff --git a/tests/ansible/vagrant/experimental/ubuntu-14.04-trusty/Vagrantfile b/test/ansible/vagrant/experimental/ubuntu-14.04-trusty/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/experimental/ubuntu-14.04-trusty/Vagrantfile
rename to test/ansible/vagrant/experimental/ubuntu-14.04-trusty/Vagrantfile
diff --git a/tests/ansible/vagrant/fedora-33/Vagrantfile b/test/ansible/vagrant/fedora-33/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/fedora-33/Vagrantfile
rename to test/ansible/vagrant/fedora-33/Vagrantfile
diff --git a/tests/ansible/vagrant/fedora-33/skip b/test/ansible/vagrant/fedora-33/skip
similarity index 100%
rename from tests/ansible/vagrant/fedora-33/skip
rename to test/ansible/vagrant/fedora-33/skip
diff --git a/tests/ansible/vagrant/fedora-34/Vagrantfile b/test/ansible/vagrant/fedora-34/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/fedora-34/Vagrantfile
rename to test/ansible/vagrant/fedora-34/Vagrantfile
diff --git a/tests/ansible/vagrant/fedora-34/skip b/test/ansible/vagrant/fedora-34/skip
similarity index 100%
rename from tests/ansible/vagrant/fedora-34/skip
rename to test/ansible/vagrant/fedora-34/skip
diff --git a/tests/ansible/vagrant/fedora-35/Vagrantfile b/test/ansible/vagrant/fedora-35/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/fedora-35/Vagrantfile
rename to test/ansible/vagrant/fedora-35/Vagrantfile
diff --git a/tests/ansible/vagrant/fedora-35/skip b/test/ansible/vagrant/fedora-35/skip
similarity index 100%
rename from tests/ansible/vagrant/fedora-35/skip
rename to test/ansible/vagrant/fedora-35/skip
diff --git a/tests/ansible/vagrant/fedora-36/Vagrantfile b/test/ansible/vagrant/fedora-36/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/fedora-36/Vagrantfile
rename to test/ansible/vagrant/fedora-36/Vagrantfile
diff --git a/tests/ansible/vagrant/fedora-36/skip b/test/ansible/vagrant/fedora-36/skip
similarity index 100%
rename from tests/ansible/vagrant/fedora-36/skip
rename to test/ansible/vagrant/fedora-36/skip
diff --git a/tests/ansible/vagrant/freebsd-12/Vagrantfile b/test/ansible/vagrant/freebsd-12/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/freebsd-12/Vagrantfile
rename to test/ansible/vagrant/freebsd-12/Vagrantfile
diff --git a/tests/ansible/vagrant/freebsd-12/skip b/test/ansible/vagrant/freebsd-12/skip
similarity index 100%
rename from tests/ansible/vagrant/freebsd-12/skip
rename to test/ansible/vagrant/freebsd-12/skip
diff --git a/tests/ansible/vagrant/freebsd-13/Vagrantfile b/test/ansible/vagrant/freebsd-13/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/freebsd-13/Vagrantfile
rename to test/ansible/vagrant/freebsd-13/Vagrantfile
diff --git a/tests/ansible/vagrant/freebsd-13/skip b/test/ansible/vagrant/freebsd-13/skip
similarity index 100%
rename from tests/ansible/vagrant/freebsd-13/skip
rename to test/ansible/vagrant/freebsd-13/skip
diff --git a/tests/ansible/vagrant/oracle-7/Vagrantfile b/test/ansible/vagrant/oracle-7/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/oracle-7/Vagrantfile
rename to test/ansible/vagrant/oracle-7/Vagrantfile
diff --git a/tests/ansible/vagrant/oracle-7/skip b/test/ansible/vagrant/oracle-7/skip
similarity index 100%
rename from tests/ansible/vagrant/oracle-7/skip
rename to test/ansible/vagrant/oracle-7/skip
diff --git a/tests/ansible/vagrant/oracle-8/Vagrantfile b/test/ansible/vagrant/oracle-8/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/oracle-8/Vagrantfile
rename to test/ansible/vagrant/oracle-8/Vagrantfile
diff --git a/tests/ansible/vagrant/oracle-9/Vagrantfile b/test/ansible/vagrant/oracle-9/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/oracle-9/Vagrantfile
rename to test/ansible/vagrant/oracle-9/Vagrantfile
diff --git a/tests/ansible/vagrant/rocky-8/Vagrantfile b/test/ansible/vagrant/rocky-8/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/rocky-8/Vagrantfile
rename to test/ansible/vagrant/rocky-8/Vagrantfile
diff --git a/tests/ansible/vagrant/rocky-9/Vagrantfile b/test/ansible/vagrant/rocky-9/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/rocky-9/Vagrantfile
rename to test/ansible/vagrant/rocky-9/Vagrantfile
diff --git a/tests/ansible/vagrant/ubuntu-16.04-xenial/Vagrantfile b/test/ansible/vagrant/ubuntu-16.04-xenial/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/ubuntu-16.04-xenial/Vagrantfile
rename to test/ansible/vagrant/ubuntu-16.04-xenial/Vagrantfile
diff --git a/tests/ansible/vagrant/ubuntu-16.04-xenial/skip b/test/ansible/vagrant/ubuntu-16.04-xenial/skip
similarity index 100%
rename from tests/ansible/vagrant/ubuntu-16.04-xenial/skip
rename to test/ansible/vagrant/ubuntu-16.04-xenial/skip
diff --git a/tests/ansible/vagrant/ubuntu-18.04-bionic/Vagrantfile b/test/ansible/vagrant/ubuntu-18.04-bionic/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/ubuntu-18.04-bionic/Vagrantfile
rename to test/ansible/vagrant/ubuntu-18.04-bionic/Vagrantfile
diff --git a/tests/ansible/vagrant/ubuntu-20.04-focal/Vagrantfile b/test/ansible/vagrant/ubuntu-20.04-focal/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/ubuntu-20.04-focal/Vagrantfile
rename to test/ansible/vagrant/ubuntu-20.04-focal/Vagrantfile
diff --git a/tests/ansible/vagrant/ubuntu-22.04-jammy/Vagrantfile b/test/ansible/vagrant/ubuntu-22.04-jammy/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/ubuntu-22.04-jammy/Vagrantfile
rename to test/ansible/vagrant/ubuntu-22.04-jammy/Vagrantfile
diff --git a/tests/ansible/vagrant/wizard/centos-8/Vagrantfile b/test/ansible/vagrant/wizard/centos-8/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/wizard/centos-8/Vagrantfile
rename to test/ansible/vagrant/wizard/centos-8/Vagrantfile
diff --git a/tests/ansible/vagrant/wizard/centos-8/bootstrap b/test/ansible/vagrant/wizard/centos-8/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/wizard/centos-8/bootstrap
rename to test/ansible/vagrant/wizard/centos-8/bootstrap
diff --git a/tests/ansible/vagrant/wizard/debian-bullseye/Vagrantfile b/test/ansible/vagrant/wizard/debian-bullseye/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/wizard/debian-bullseye/Vagrantfile
rename to test/ansible/vagrant/wizard/debian-bullseye/Vagrantfile
diff --git a/tests/ansible/vagrant/wizard/debian-bullseye/bootstrap b/test/ansible/vagrant/wizard/debian-bullseye/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/wizard/debian-bullseye/bootstrap
rename to test/ansible/vagrant/wizard/debian-bullseye/bootstrap
diff --git a/tests/ansible/vagrant/wizard/debian-buster/Vagrantfile b/test/ansible/vagrant/wizard/debian-buster/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/wizard/debian-buster/Vagrantfile
rename to test/ansible/vagrant/wizard/debian-buster/Vagrantfile
diff --git a/tests/ansible/vagrant/wizard/debian-buster/bootstrap b/test/ansible/vagrant/wizard/debian-buster/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/wizard/debian-buster/bootstrap
rename to test/ansible/vagrant/wizard/debian-buster/bootstrap
diff --git a/tests/ansible/vagrant/wizard/fedora-36/Vagrantfile b/test/ansible/vagrant/wizard/fedora-36/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/wizard/fedora-36/Vagrantfile
rename to test/ansible/vagrant/wizard/fedora-36/Vagrantfile
diff --git a/tests/ansible/vagrant/wizard/fedora-36/bootstrap b/test/ansible/vagrant/wizard/fedora-36/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/wizard/fedora-36/bootstrap
rename to test/ansible/vagrant/wizard/fedora-36/bootstrap
diff --git a/tests/ansible/vagrant/wizard/ubuntu-22.04-jammy/Vagrantfile b/test/ansible/vagrant/wizard/ubuntu-22.04-jammy/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/wizard/ubuntu-22.04-jammy/Vagrantfile
rename to test/ansible/vagrant/wizard/ubuntu-22.04-jammy/Vagrantfile
diff --git a/tests/ansible/vagrant/wizard/ubuntu-22.04-jammy/bootstrap b/test/ansible/vagrant/wizard/ubuntu-22.04-jammy/bootstrap
similarity index 100%
rename from tests/ansible/vagrant/wizard/ubuntu-22.04-jammy/bootstrap
rename to test/ansible/vagrant/wizard/ubuntu-22.04-jammy/bootstrap
diff --git a/tests/ansible/vagrant/wizard/ubuntu-22.10-kinetic/Vagrantfile b/test/ansible/vagrant/wizard/ubuntu-22.10-kinetic/Vagrantfile
similarity index 100%
rename from tests/ansible/vagrant/wizard/ubuntu-22.10-kinetic/Vagrantfile
rename to test/ansible/vagrant/wizard/ubuntu-22.10-kinetic/Vagrantfile
diff --git a/tests/ansible/vars/go.yml b/test/ansible/vars/go.yml
similarity index 77%
rename from tests/ansible/vars/go.yml
rename to test/ansible/vars/go.yml
index de11ec17e..9ad879d6f 100644
--- a/tests/ansible/vars/go.yml
+++ b/test/ansible/vars/go.yml
@@ -1,5 +1,5 @@
 # vim: set ft=yaml.ansible:
 ---
 
-golang_version: "1.19.1"
+golang_version: "1.20.1"
 golang_install_dir: "/opt/go/{{ golang_version }}"
diff --git a/tests/ansible/vars/mysql.yml b/test/ansible/vars/mysql.yml
similarity index 100%
rename from tests/ansible/vars/mysql.yml
rename to test/ansible/vars/mysql.yml
diff --git a/tests/ansible/vars/postgres.yml b/test/ansible/vars/postgres.yml
similarity index 100%
rename from tests/ansible/vars/postgres.yml
rename to test/ansible/vars/postgres.yml
diff --git a/tests/bats-detect/WARNING.md b/test/bats-detect/WARNING.md
similarity index 100%
rename from tests/bats-detect/WARNING.md
rename to test/bats-detect/WARNING.md
diff --git a/tests/bats-detect/apache2-deb.bats b/test/bats-detect/apache2-deb.bats
similarity index 100%
rename from tests/bats-detect/apache2-deb.bats
rename to test/bats-detect/apache2-deb.bats
diff --git a/tests/bats-detect/apache2-rpm.bats b/test/bats-detect/apache2-rpm.bats
similarity index 100%
rename from tests/bats-detect/apache2-rpm.bats
rename to test/bats-detect/apache2-rpm.bats
diff --git a/tests/bats-detect/asterisk-deb.bats b/test/bats-detect/asterisk-deb.bats
similarity index 100%
rename from tests/bats-detect/asterisk-deb.bats
rename to test/bats-detect/asterisk-deb.bats
diff --git a/tests/bats-detect/asterisk-rpm.bats b/test/bats-detect/asterisk-rpm.bats
similarity index 100%
rename from tests/bats-detect/asterisk-rpm.bats
rename to test/bats-detect/asterisk-rpm.bats
diff --git a/tests/bats-detect/caddy-deb.bats b/test/bats-detect/caddy-deb.bats
similarity index 100%
rename from tests/bats-detect/caddy-deb.bats
rename to test/bats-detect/caddy-deb.bats
diff --git a/tests/bats-detect/caddy-rpm.bats b/test/bats-detect/caddy-rpm.bats
similarity index 100%
rename from tests/bats-detect/caddy-rpm.bats
rename to test/bats-detect/caddy-rpm.bats
diff --git a/tests/bats-detect/dovecot-deb.bats b/test/bats-detect/dovecot-deb.bats
similarity index 100%
rename from tests/bats-detect/dovecot-deb.bats
rename to test/bats-detect/dovecot-deb.bats
diff --git a/tests/bats-detect/dovecot-rpm.bats b/test/bats-detect/dovecot-rpm.bats
similarity index 100%
rename from tests/bats-detect/dovecot-rpm.bats
rename to test/bats-detect/dovecot-rpm.bats
diff --git a/tests/bats-detect/emby-deb.bats b/test/bats-detect/emby-deb.bats
similarity index 100%
rename from tests/bats-detect/emby-deb.bats
rename to test/bats-detect/emby-deb.bats
diff --git a/tests/bats-detect/emby-rpm.bats b/test/bats-detect/emby-rpm.bats
similarity index 100%
rename from tests/bats-detect/emby-rpm.bats
rename to test/bats-detect/emby-rpm.bats
diff --git a/tests/bats-detect/endlessh-deb.bats b/test/bats-detect/endlessh-deb.bats
similarity index 100%
rename from tests/bats-detect/endlessh-deb.bats
rename to test/bats-detect/endlessh-deb.bats
diff --git a/tests/bats-detect/endlessh-rpm.bats b/test/bats-detect/endlessh-rpm.bats
similarity index 100%
rename from tests/bats-detect/endlessh-rpm.bats
rename to test/bats-detect/endlessh-rpm.bats
diff --git a/tests/bats-detect/gitea.bats b/test/bats-detect/gitea.bats
similarity index 100%
rename from tests/bats-detect/gitea.bats
rename to test/bats-detect/gitea.bats
diff --git a/tests/bats-detect/haproxy-deb.bats b/test/bats-detect/haproxy-deb.bats
similarity index 100%
rename from tests/bats-detect/haproxy-deb.bats
rename to test/bats-detect/haproxy-deb.bats
diff --git a/tests/bats-detect/haproxy-rpm.bats b/test/bats-detect/haproxy-rpm.bats
similarity index 100%
rename from tests/bats-detect/haproxy-rpm.bats
rename to test/bats-detect/haproxy-rpm.bats
diff --git a/tests/bats-detect/lemonldap-deb.bats b/test/bats-detect/lemonldap-deb.bats
similarity index 100%
rename from tests/bats-detect/lemonldap-deb.bats
rename to test/bats-detect/lemonldap-deb.bats
diff --git a/tests/bats-detect/lemonldap-rpm.bats b/test/bats-detect/lemonldap-rpm.bats
similarity index 100%
rename from tests/bats-detect/lemonldap-rpm.bats
rename to test/bats-detect/lemonldap-rpm.bats
diff --git a/tests/bats-detect/lib/setup_file_detect.sh b/test/bats-detect/lib/setup_file_detect.sh
similarity index 100%
rename from tests/bats-detect/lib/setup_file_detect.sh
rename to test/bats-detect/lib/setup_file_detect.sh
diff --git a/tests/bats-detect/litespeed.bats b/test/bats-detect/litespeed.bats
similarity index 100%
rename from tests/bats-detect/litespeed.bats
rename to test/bats-detect/litespeed.bats
diff --git a/tests/bats-detect/mariadb-deb.bats b/test/bats-detect/mariadb-deb.bats
similarity index 100%
rename from tests/bats-detect/mariadb-deb.bats
rename to test/bats-detect/mariadb-deb.bats
diff --git a/tests/bats-detect/mariadb-rpm.bats b/test/bats-detect/mariadb-rpm.bats
similarity index 100%
rename from tests/bats-detect/mariadb-rpm.bats
rename to test/bats-detect/mariadb-rpm.bats
diff --git a/tests/bats-detect/mysql-deb.bats b/test/bats-detect/mysql-deb.bats
similarity index 100%
rename from tests/bats-detect/mysql-deb.bats
rename to test/bats-detect/mysql-deb.bats
diff --git a/tests/bats-detect/mysql-rpm.bats b/test/bats-detect/mysql-rpm.bats
similarity index 100%
rename from tests/bats-detect/mysql-rpm.bats
rename to test/bats-detect/mysql-rpm.bats
diff --git a/tests/bats-detect/nginx-deb.bats b/test/bats-detect/nginx-deb.bats
similarity index 100%
rename from tests/bats-detect/nginx-deb.bats
rename to test/bats-detect/nginx-deb.bats
diff --git a/tests/bats-detect/nginx-rpm.bats b/test/bats-detect/nginx-rpm.bats
similarity index 100%
rename from tests/bats-detect/nginx-rpm.bats
rename to test/bats-detect/nginx-rpm.bats
diff --git a/tests/bats-detect/odoo-deb.bats b/test/bats-detect/odoo-deb.bats
similarity index 100%
rename from tests/bats-detect/odoo-deb.bats
rename to test/bats-detect/odoo-deb.bats
diff --git a/tests/bats-detect/odoo-rpm.bats b/test/bats-detect/odoo-rpm.bats
similarity index 100%
rename from tests/bats-detect/odoo-rpm.bats
rename to test/bats-detect/odoo-rpm.bats
diff --git a/tests/bats-detect/ombi-deb.bats b/test/bats-detect/ombi-deb.bats
similarity index 100%
rename from tests/bats-detect/ombi-deb.bats
rename to test/bats-detect/ombi-deb.bats
diff --git a/tests/bats-detect/openresty-deb.bats b/test/bats-detect/openresty-deb.bats
similarity index 100%
rename from tests/bats-detect/openresty-deb.bats
rename to test/bats-detect/openresty-deb.bats
diff --git a/tests/bats-detect/openresty-rpm.bats b/test/bats-detect/openresty-rpm.bats
similarity index 100%
rename from tests/bats-detect/openresty-rpm.bats
rename to test/bats-detect/openresty-rpm.bats
diff --git a/tests/bats-detect/pgsql-deb.bats b/test/bats-detect/pgsql-deb.bats
similarity index 100%
rename from tests/bats-detect/pgsql-deb.bats
rename to test/bats-detect/pgsql-deb.bats
diff --git a/tests/bats-detect/pgsql-rpm.bats b/test/bats-detect/pgsql-rpm.bats
similarity index 100%
rename from tests/bats-detect/pgsql-rpm.bats
rename to test/bats-detect/pgsql-rpm.bats
diff --git a/tests/bats-detect/postfix-deb.bats b/test/bats-detect/postfix-deb.bats
similarity index 100%
rename from tests/bats-detect/postfix-deb.bats
rename to test/bats-detect/postfix-deb.bats
diff --git a/tests/bats-detect/postfix-rpm.bats b/test/bats-detect/postfix-rpm.bats
similarity index 100%
rename from tests/bats-detect/postfix-rpm.bats
rename to test/bats-detect/postfix-rpm.bats
diff --git a/tests/bats-detect/proftpd-deb.bats b/test/bats-detect/proftpd-deb.bats
similarity index 100%
rename from tests/bats-detect/proftpd-deb.bats
rename to test/bats-detect/proftpd-deb.bats
diff --git a/tests/bats-detect/proftpd-rpm.bats b/test/bats-detect/proftpd-rpm.bats
similarity index 100%
rename from tests/bats-detect/proftpd-rpm.bats
rename to test/bats-detect/proftpd-rpm.bats
diff --git a/tests/bats-detect/proxmox-deb.bats b/test/bats-detect/proxmox-deb.bats
similarity index 100%
rename from tests/bats-detect/proxmox-deb.bats
rename to test/bats-detect/proxmox-deb.bats
diff --git a/tests/bats-detect/pureftpd-deb.bats b/test/bats-detect/pureftpd-deb.bats
similarity index 100%
rename from tests/bats-detect/pureftpd-deb.bats
rename to test/bats-detect/pureftpd-deb.bats
diff --git a/tests/bats-detect/pureftpd-rpm.bats b/test/bats-detect/pureftpd-rpm.bats
similarity index 100%
rename from tests/bats-detect/pureftpd-rpm.bats
rename to test/bats-detect/pureftpd-rpm.bats
diff --git a/tests/bats-detect/smb-deb.bats b/test/bats-detect/smb-deb.bats
similarity index 100%
rename from tests/bats-detect/smb-deb.bats
rename to test/bats-detect/smb-deb.bats
diff --git a/tests/bats-detect/smb-rpm.bats b/test/bats-detect/smb-rpm.bats
similarity index 100%
rename from tests/bats-detect/smb-rpm.bats
rename to test/bats-detect/smb-rpm.bats
diff --git a/tests/bats-detect/sshd-deb.bats b/test/bats-detect/sshd-deb.bats
similarity index 100%
rename from tests/bats-detect/sshd-deb.bats
rename to test/bats-detect/sshd-deb.bats
diff --git a/tests/bats-detect/sshd-rpm.bats b/test/bats-detect/sshd-rpm.bats
similarity index 100%
rename from tests/bats-detect/sshd-rpm.bats
rename to test/bats-detect/sshd-rpm.bats
diff --git a/tests/bats-detect/suricata-deb.bats b/test/bats-detect/suricata-deb.bats
similarity index 100%
rename from tests/bats-detect/suricata-deb.bats
rename to test/bats-detect/suricata-deb.bats
diff --git a/tests/bats-detect/suricata-rpm.bats b/test/bats-detect/suricata-rpm.bats
similarity index 100%
rename from tests/bats-detect/suricata-rpm.bats
rename to test/bats-detect/suricata-rpm.bats
diff --git a/tests/bats-detect/testdata/enable_lst_debian_repo.sh b/test/bats-detect/testdata/enable_lst_debian_repo.sh
similarity index 100%
rename from tests/bats-detect/testdata/enable_lst_debian_repo.sh
rename to test/bats-detect/testdata/enable_lst_debian_repo.sh
diff --git a/tests/bats-detect/vsftpd-deb.bats b/test/bats-detect/vsftpd-deb.bats
similarity index 100%
rename from tests/bats-detect/vsftpd-deb.bats
rename to test/bats-detect/vsftpd-deb.bats
diff --git a/tests/bats-detect/vsftpd-rpm.bats b/test/bats-detect/vsftpd-rpm.bats
similarity index 100%
rename from tests/bats-detect/vsftpd-rpm.bats
rename to test/bats-detect/vsftpd-rpm.bats
diff --git a/tests/bats.mk b/test/bats.mk
similarity index 98%
rename from tests/bats.mk
rename to test/bats.mk
index b39d952b8..cd4e6286b 100644
--- a/tests/bats.mk
+++ b/test/bats.mk
@@ -1,6 +1,6 @@
 
 # contains scripts, bats submodules, local instances and functional test suite
-TEST_DIR = $(CURDIR)/tests
+TEST_DIR = $(CURDIR)/test
 
 ifdef PACKAGE_TESTING
   # define PACKAGE_TESTING to test the executables already installed with
@@ -92,7 +92,7 @@ bats-clean:
 	@$(RM) $(TEST_DIR)/local $(WIN_IGNORE_ERR)
 	@$(RM) $(LOCAL_INIT_DIR) $(WIN_IGNORE_ERR)
 	@$(RM) $(TEST_DIR)/dyn-bats/*.bats $(WIN_IGNORE_ERR)
-	@$(RM) tests/.environment.sh $(WIN_IGNORE_ERR)
+	@$(RM) test/.environment.sh $(WIN_IGNORE_ERR)
 
 # Run the test suite
 bats-test: bats-environment bats-check-requirements
diff --git a/tests/bats/01_crowdsec.bats b/test/bats/01_crowdsec.bats
similarity index 100%
rename from tests/bats/01_crowdsec.bats
rename to test/bats/01_crowdsec.bats
diff --git a/tests/bats/01_cscli.bats b/test/bats/01_cscli.bats
similarity index 100%
rename from tests/bats/01_cscli.bats
rename to test/bats/01_cscli.bats
diff --git a/tests/bats/02_nolapi.bats b/test/bats/02_nolapi.bats
similarity index 100%
rename from tests/bats/02_nolapi.bats
rename to test/bats/02_nolapi.bats
diff --git a/tests/bats/03_noagent.bats b/test/bats/03_noagent.bats
similarity index 100%
rename from tests/bats/03_noagent.bats
rename to test/bats/03_noagent.bats
diff --git a/tests/bats/04_capi.bats b/test/bats/04_capi.bats
similarity index 100%
rename from tests/bats/04_capi.bats
rename to test/bats/04_capi.bats
diff --git a/tests/bats/04_nocapi.bats b/test/bats/04_nocapi.bats
similarity index 100%
rename from tests/bats/04_nocapi.bats
rename to test/bats/04_nocapi.bats
diff --git a/tests/bats/05_config_yaml_local.bats b/test/bats/05_config_yaml_local.bats
similarity index 100%
rename from tests/bats/05_config_yaml_local.bats
rename to test/bats/05_config_yaml_local.bats
diff --git a/tests/bats/07_setup.bats b/test/bats/07_setup.bats
similarity index 100%
rename from tests/bats/07_setup.bats
rename to test/bats/07_setup.bats
diff --git a/tests/bats/10_bouncers.bats b/test/bats/10_bouncers.bats
similarity index 100%
rename from tests/bats/10_bouncers.bats
rename to test/bats/10_bouncers.bats
diff --git a/tests/bats/11_bouncers_tls.bats b/test/bats/11_bouncers_tls.bats
similarity index 100%
rename from tests/bats/11_bouncers_tls.bats
rename to test/bats/11_bouncers_tls.bats
diff --git a/tests/bats/20_collections.bats b/test/bats/20_collections.bats
similarity index 100%
rename from tests/bats/20_collections.bats
rename to test/bats/20_collections.bats
diff --git a/tests/bats/30_machines.bats b/test/bats/30_machines.bats
similarity index 100%
rename from tests/bats/30_machines.bats
rename to test/bats/30_machines.bats
diff --git a/tests/bats/30_machines_tls.bats b/test/bats/30_machines_tls.bats
similarity index 100%
rename from tests/bats/30_machines_tls.bats
rename to test/bats/30_machines_tls.bats
diff --git a/tests/bats/40_cold-logs.bats b/test/bats/40_cold-logs.bats
similarity index 100%
rename from tests/bats/40_cold-logs.bats
rename to test/bats/40_cold-logs.bats
diff --git a/tests/bats/40_live-ban.bats b/test/bats/40_live-ban.bats
similarity index 100%
rename from tests/bats/40_live-ban.bats
rename to test/bats/40_live-ban.bats
diff --git a/tests/bats/50_simulation.bats b/test/bats/50_simulation.bats
similarity index 100%
rename from tests/bats/50_simulation.bats
rename to test/bats/50_simulation.bats
diff --git a/tests/bats/70_http_plugin.bats b/test/bats/70_http_plugin.bats
similarity index 100%
rename from tests/bats/70_http_plugin.bats
rename to test/bats/70_http_plugin.bats
diff --git a/tests/bats/71_dummy_plugin.bats b/test/bats/71_dummy_plugin.bats
similarity index 100%
rename from tests/bats/71_dummy_plugin.bats
rename to test/bats/71_dummy_plugin.bats
diff --git a/tests/bats/72_plugin_badconfig.bats b/test/bats/72_plugin_badconfig.bats
similarity index 100%
rename from tests/bats/72_plugin_badconfig.bats
rename to test/bats/72_plugin_badconfig.bats
diff --git a/tests/bats/80_alerts.bats b/test/bats/80_alerts.bats
similarity index 100%
rename from tests/bats/80_alerts.bats
rename to test/bats/80_alerts.bats
diff --git a/tests/bats/81_alert_context.bats b/test/bats/81_alert_context.bats
similarity index 100%
rename from tests/bats/81_alert_context.bats
rename to test/bats/81_alert_context.bats
diff --git a/tests/bats/90_decisions.bats b/test/bats/90_decisions.bats
similarity index 100%
rename from tests/bats/90_decisions.bats
rename to test/bats/90_decisions.bats
diff --git a/tests/bats/97_ipv4_single.bats b/test/bats/97_ipv4_single.bats
similarity index 100%
rename from tests/bats/97_ipv4_single.bats
rename to test/bats/97_ipv4_single.bats
diff --git a/tests/bats/97_ipv6_single.bats b/test/bats/97_ipv6_single.bats
similarity index 100%
rename from tests/bats/97_ipv6_single.bats
rename to test/bats/97_ipv6_single.bats
diff --git a/tests/bats/98_ipv4_range.bats b/test/bats/98_ipv4_range.bats
similarity index 100%
rename from tests/bats/98_ipv4_range.bats
rename to test/bats/98_ipv4_range.bats
diff --git a/tests/bats/98_ipv6_range.bats b/test/bats/98_ipv6_range.bats
similarity index 100%
rename from tests/bats/98_ipv6_range.bats
rename to test/bats/98_ipv6_range.bats
diff --git a/tests/bats/99_lapi-stream-mode-scenario.bats b/test/bats/99_lapi-stream-mode-scenario.bats
similarity index 100%
rename from tests/bats/99_lapi-stream-mode-scenario.bats
rename to test/bats/99_lapi-stream-mode-scenario.bats
diff --git a/tests/bats/99_lapi-stream-mode-scopes.bats b/test/bats/99_lapi-stream-mode-scopes.bats
similarity index 100%
rename from tests/bats/99_lapi-stream-mode-scopes.bats
rename to test/bats/99_lapi-stream-mode-scopes.bats
diff --git a/tests/bats/99_lapi-stream-mode.bats b/test/bats/99_lapi-stream-mode.bats
similarity index 100%
rename from tests/bats/99_lapi-stream-mode.bats
rename to test/bats/99_lapi-stream-mode.bats
diff --git a/tests/bats/reformat b/test/bats/reformat
similarity index 100%
rename from tests/bats/reformat
rename to test/bats/reformat
diff --git a/tests/bats/testdata/07_setup/detect.yaml b/test/bats/testdata/07_setup/detect.yaml
similarity index 100%
rename from tests/bats/testdata/07_setup/detect.yaml
rename to test/bats/testdata/07_setup/detect.yaml
diff --git a/tests/bats/testdata/cfssl/agent.json b/test/bats/testdata/cfssl/agent.json
similarity index 100%
rename from tests/bats/testdata/cfssl/agent.json
rename to test/bats/testdata/cfssl/agent.json
diff --git a/tests/bats/testdata/cfssl/agent_invalid.json b/test/bats/testdata/cfssl/agent_invalid.json
similarity index 100%
rename from tests/bats/testdata/cfssl/agent_invalid.json
rename to test/bats/testdata/cfssl/agent_invalid.json
diff --git a/tests/bats/testdata/cfssl/bouncer.json b/test/bats/testdata/cfssl/bouncer.json
similarity index 100%
rename from tests/bats/testdata/cfssl/bouncer.json
rename to test/bats/testdata/cfssl/bouncer.json
diff --git a/tests/bats/testdata/cfssl/bouncer_invalid.json b/test/bats/testdata/cfssl/bouncer_invalid.json
similarity index 100%
rename from tests/bats/testdata/cfssl/bouncer_invalid.json
rename to test/bats/testdata/cfssl/bouncer_invalid.json
diff --git a/tests/bats/testdata/cfssl/ca.json b/test/bats/testdata/cfssl/ca.json
similarity index 100%
rename from tests/bats/testdata/cfssl/ca.json
rename to test/bats/testdata/cfssl/ca.json
diff --git a/tests/bats/testdata/cfssl/intermediate.json b/test/bats/testdata/cfssl/intermediate.json
similarity index 100%
rename from tests/bats/testdata/cfssl/intermediate.json
rename to test/bats/testdata/cfssl/intermediate.json
diff --git a/tests/bats/testdata/cfssl/profiles.json b/test/bats/testdata/cfssl/profiles.json
similarity index 100%
rename from tests/bats/testdata/cfssl/profiles.json
rename to test/bats/testdata/cfssl/profiles.json
diff --git a/tests/bats/testdata/cfssl/server.json b/test/bats/testdata/cfssl/server.json
similarity index 100%
rename from tests/bats/testdata/cfssl/server.json
rename to test/bats/testdata/cfssl/server.json
diff --git a/tests/bats/testdata/explain/explain-log.txt b/test/bats/testdata/explain/explain-log.txt
similarity index 100%
rename from tests/bats/testdata/explain/explain-log.txt
rename to test/bats/testdata/explain/explain-log.txt
diff --git a/tests/bin/assert-crowdsec-not-running b/test/bin/assert-crowdsec-not-running
similarity index 100%
rename from tests/bin/assert-crowdsec-not-running
rename to test/bin/assert-crowdsec-not-running
diff --git a/tests/bin/check-requirements b/test/bin/check-requirements
similarity index 100%
rename from tests/bin/check-requirements
rename to test/bin/check-requirements
diff --git a/tests/bin/collect-hub-coverage b/test/bin/collect-hub-coverage
similarity index 100%
rename from tests/bin/collect-hub-coverage
rename to test/bin/collect-hub-coverage
diff --git a/tests/bin/crowdsec-wrapper b/test/bin/crowdsec-wrapper
similarity index 100%
rename from tests/bin/crowdsec-wrapper
rename to test/bin/crowdsec-wrapper
diff --git a/tests/bin/cscli-wrapper b/test/bin/cscli-wrapper
similarity index 100%
rename from tests/bin/cscli-wrapper
rename to test/bin/cscli-wrapper
diff --git a/tests/bin/generate-hub-tests b/test/bin/generate-hub-tests
similarity index 100%
rename from tests/bin/generate-hub-tests
rename to test/bin/generate-hub-tests
diff --git a/tests/bin/mock-http.py b/test/bin/mock-http.py
similarity index 100%
rename from tests/bin/mock-http.py
rename to test/bin/mock-http.py
diff --git a/tests/bin/wait-for-port b/test/bin/wait-for-port
similarity index 100%
rename from tests/bin/wait-for-port
rename to test/bin/wait-for-port
diff --git a/tests/disable-capi b/test/disable-capi
similarity index 100%
rename from tests/disable-capi
rename to test/disable-capi
diff --git a/tests/dyn-bats/README.md b/test/dyn-bats/README.md
similarity index 100%
rename from tests/dyn-bats/README.md
rename to test/dyn-bats/README.md
diff --git a/tests/enable-capi b/test/enable-capi
similarity index 100%
rename from tests/enable-capi
rename to test/enable-capi
diff --git a/tests/instance-crowdsec b/test/instance-crowdsec
similarity index 100%
rename from tests/instance-crowdsec
rename to test/instance-crowdsec
diff --git a/tests/instance-data b/test/instance-data
similarity index 100%
rename from tests/instance-data
rename to test/instance-data
diff --git a/tests/instance-db b/test/instance-db
similarity index 100%
rename from tests/instance-db
rename to test/instance-db
diff --git a/tests/instance-mock-http b/test/instance-mock-http
similarity index 100%
rename from tests/instance-mock-http
rename to test/instance-mock-http
diff --git a/tests/lib/bats-assert b/test/lib/bats-assert
similarity index 100%
rename from tests/lib/bats-assert
rename to test/lib/bats-assert
diff --git a/tests/lib/bats-core b/test/lib/bats-core
similarity index 100%
rename from tests/lib/bats-core
rename to test/lib/bats-core
diff --git a/tests/lib/bats-file b/test/lib/bats-file
similarity index 100%
rename from tests/lib/bats-file
rename to test/lib/bats-file
diff --git a/tests/lib/bats-mock b/test/lib/bats-mock
similarity index 100%
rename from tests/lib/bats-mock
rename to test/lib/bats-mock
diff --git a/tests/lib/bats-support b/test/lib/bats-support
similarity index 100%
rename from tests/lib/bats-support
rename to test/lib/bats-support
diff --git a/tests/lib/config/config-global b/test/lib/config/config-global
similarity index 100%
rename from tests/lib/config/config-global
rename to test/lib/config/config-global
diff --git a/tests/lib/config/config-local b/test/lib/config/config-local
similarity index 100%
rename from tests/lib/config/config-local
rename to test/lib/config/config-local
diff --git a/tests/lib/db/instance-mysql b/test/lib/db/instance-mysql
similarity index 100%
rename from tests/lib/db/instance-mysql
rename to test/lib/db/instance-mysql
diff --git a/tests/lib/db/instance-pgx b/test/lib/db/instance-pgx
similarity index 100%
rename from tests/lib/db/instance-pgx
rename to test/lib/db/instance-pgx
diff --git a/tests/lib/db/instance-postgres b/test/lib/db/instance-postgres
similarity index 100%
rename from tests/lib/db/instance-postgres
rename to test/lib/db/instance-postgres
diff --git a/tests/lib/db/instance-sqlite b/test/lib/db/instance-sqlite
similarity index 100%
rename from tests/lib/db/instance-sqlite
rename to test/lib/db/instance-sqlite
diff --git a/tests/lib/init/crowdsec-daemon b/test/lib/init/crowdsec-daemon
similarity index 100%
rename from tests/lib/init/crowdsec-daemon
rename to test/lib/init/crowdsec-daemon
diff --git a/tests/lib/init/crowdsec-systemd b/test/lib/init/crowdsec-systemd
similarity index 100%
rename from tests/lib/init/crowdsec-systemd
rename to test/lib/init/crowdsec-systemd
diff --git a/tests/lib/setup.sh b/test/lib/setup.sh
similarity index 100%
rename from tests/lib/setup.sh
rename to test/lib/setup.sh
diff --git a/tests/lib/setup_file.sh b/test/lib/setup_file.sh
similarity index 100%
rename from tests/lib/setup_file.sh
rename to test/lib/setup_file.sh
diff --git a/tests/lib/teardown_file.sh b/test/lib/teardown_file.sh
similarity index 100%
rename from tests/lib/teardown_file.sh
rename to test/lib/teardown_file.sh
diff --git a/tests/localstack/docker-compose.yml b/test/localstack/docker-compose.yml
similarity index 100%
rename from tests/localstack/docker-compose.yml
rename to test/localstack/docker-compose.yml
diff --git a/tests/run-tests b/test/run-tests
similarity index 100%
rename from tests/run-tests
rename to test/run-tests