diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..bb09719d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,85 @@
+name: 🐞 Bug Report
+description: File a Bug report in Java Integration
+title: "🐞: "
+labels: [ "type:bug", "triage" ]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: dropdown
+    id: integration
+    attributes:
+      label: What Allure Integration are you using?
+      multiple: true
+      description: Please select the Allure integration you
+      options:
+        - allure-assertj
+        - allure-attachments
+        - allure-awaitility
+        - allure-citrus
+        - allure-cucumber2-jvm
+        - allure-cucumber3-jvm
+        - allure-cucumber4-jvm
+        - allure-cucumber5-jvm
+        - allure-cucumber6-jvm
+        - allure-cucumber7-jvm
+        - allure-descriptions-javadoc
+        - allure-grpc
+        - allure-hamcrest
+        - allure-httpclient
+        - allure-java-commons
+        - allure-jax-rs
+        - allure-jbehave
+        - allure-jbehave5
+        - allure-jsonunit
+        - allure-junit-platform
+        - allure-junit4
+        - allure-junit5
+        - allure-karate
+        - allure-okhttp
+        - allure-okhttp3
+        - allure-reader
+        - allure-rest-assured
+        - allure-scalatest
+        - allure-selenide
+        - allure-servlet-api
+        - allure-spock
+        - allure-spock2
+        - allure-spring-web
+        - allure-test-filter
+        - allure-testng
+    validations:
+      required: true
+  - type: input
+    id: integration_version
+    attributes:
+      label: What version of Allure Integration you are using?
+      placeholder: 2.22.3
+    validations:
+      required: true
+  - type: input
+    id: allure_report_version
+    attributes:
+      label: What version of Allure Report you are using?
+      placeholder: 2.22.3
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/allure-framework/allure-java/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..fb81bedae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: ⭐️ Allure Report | main repository | give us a ⭐️
+    url: https://github.com/allure-framework/allure2
+    about: For Allure Report related issues.
+  - name: 💬 Allure Report Community - for bugs, issues, dedicated support and more!
+    url: https://github.com/orgs/allure-framework/discussions
+    about: Please ask and answer questions here.
+  - name: 💚 Allure TestOps Support
+    url: https://help.qameta.io/support/home
+    about: Please report Allure TestOps issues here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0dec83312..8178c9b61 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@ Thank you so much for sending us a pull request!
 
 Make sure you have a clear name for your pull request. 
 The name should start with a capital letter and no dot is required in the end of the sentence.
-To link the request with isses use the following notation: (fixes #123, fixes #321\)
+To link the request with issues use the following notation: (fixes #123, fixes #321\)
 
 An example of good pull request names:
 * Add Cucumber integration (fixes #123\)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..240d09840
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "type:dependencies"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "type:dependencies"
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..a419c97f9
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,84 @@
+"theme:workflow":
+  - ".github/**"
+
+"theme:build":
+  - "gradle/**"
+  - "build.gradle.kts"
+  - "**/build.gradle.kts"
+  - "gradle.properties"
+  - ".gitignore"
+
+"theme:assertj":
+  - "allure-assertj/**"
+
+"theme:attachments":
+  - "allure-attachments/**"
+
+"theme:citrus":
+  - "allure-citrus/**"
+
+"theme:cucumber-jvm":
+  - "allure-cucumber*-jvm/**"
+
+"theme:descriptions-javadoc":
+  - "allure-descriptions-javadoc/**"
+
+"theme:httpclient":
+  - "allure-httpclient/**"
+
+"theme:model":
+  - "allure-model/**"
+
+"theme:core":
+  - "allure-java-commons/**"
+  - "allure-java-commons-test/**"
+  - "allure-test-filter/**"
+
+"theme:jax-rs":
+  - "allure-jax-rs/**"
+
+"theme:jbehave":
+  - "allure-jbehave*/**"
+
+"theme:jsonunit":
+  - "allure-jsonunit/**"
+
+"theme:junit4":
+  - "allure-junit4/**"
+  - "allure-junit4-aspect/**"
+
+"theme:junit-platform":
+  - "allure-junit5/**"
+  - "allure-junit5-assert/**"
+  - "allure-junit-platform/**"
+
+"theme:karate":
+  - "allure-karate/**"
+
+"theme:okhttp":
+  - "allure-okhttp/**"
+  - "allure-okhttp3/**"
+
+"theme:rest-assured":
+  - "allure-rest-assured/**"
+
+"theme:scalatest":
+  - "allure-scalatest/**"
+
+"theme:selenide":
+  - "allure-selenide/**"
+
+"theme:servlet-api":
+  - "allure-servlet-api/**"
+
+"theme:spock":
+  - "allure-spock/**"
+
+"theme:spring":
+  - "allure-spring-web/**"
+
+"theme:testng":
+  - "allure-testng/**"
+
+"theme:hamcrest":
+  - "allure-hamcrest/**"
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000..7c30a5979
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,25 @@
+# release.yml
+
+changelog:
+  categories:
+    - title: '🚀 New Features'
+      labels:
+        - 'type:new feature'
+    - title: '🔬 Improvements'
+      labels:
+        - 'type:improvement'
+    - title: '🐞 Bug Fixes'
+      labels:
+        - 'type:bug'
+    - title: '⬆️ Dependency Updates'
+      labels:
+        - 'type:dependencies'
+    - title: '📖 Documentation improvements'
+      labels:
+        - 'type:documentation'
+    - title: '⛔️ Security'
+      labels:
+        - 'type:security'
+    - title: '👻 Internal changes'
+      labels:
+        - 'type:internal'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..8f537bc9c
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,34 @@
+name: Build
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - 'main'
+      - 'hotfix-*'
+
+jobs:
+  build:
+    name: "Build"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: "Set up JDK"
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: 21
+
+      - name: "Build with Gradle"
+        run: ./gradlew build -x test --scan
+
+      - name: "Run tests"
+        if: always()
+        run: ./gradlew --no-build-cache cleanTest test
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
new file mode 100644
index 000000000..748dfe670
--- /dev/null
+++ b/.github/workflows/dependency-submission.yml
@@ -0,0 +1,22 @@
+name: Dependency Submission
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    name: Dependency Submission
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v5
+        env:
+          DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':allure-java-commons-test'
+          DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: 'runtimeClasspath'
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 000000000..f49976b59
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,17 @@
+name: "Set theme labels"
+
+on:
+  - pull_request_target
+
+permissions:
+  contents: read 
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: actions/labeler@v4
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
new file mode 100644
index 000000000..7315a905a
--- /dev/null
+++ b/.github/workflows/labels-verify.yml
@@ -0,0 +1,27 @@
+name: "Verify type labels"
+
+on:
+  pull_request_target:
+    types: [opened, labeled, unlabeled, synchronize]
+
+permissions:
+  contents: none 
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    steps:
+      - uses: baev/action-label-verify@main
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          allowed: |
+            type:bug
+            type:dependencies
+            type:improvement
+            type:internal
+            type:invalid
+            type:new feature
+            type:security
+            type:documentation
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 000000000..2295deb90
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,41 @@
+name: Publish
+
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: read 
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: "Set up JDK"
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+
+      - name: Set up GPG
+        run: echo -n "${GPG_PRIVATE_KEY}" | base64 --decode > ${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
+        env:
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+
+      - name: "Gradle Build"
+        run: ./gradlew build -Pversion=${GITHUB_REF:10}
+
+      - name: "Gradle Publish"
+        run: |
+          ./gradlew publishToSonatype closeSonatypeStagingRepository -Pversion=${GITHUB_REF:10} \
+                    -Psigning.keyId=${GPG_KEY_ID} \
+                    -Psigning.password=${GPG_PASSPHRASE} \
+                    -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
+        env:
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..7d5ace556
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,62 @@
+name: Release
+run-name: Release ${{ inputs.releaseVersion }} (next ${{ inputs.nextVersion }}) by ${{ github.actor }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: "The release version in <MAJOR>.<MINOR>.<PATCH> format"
+        required: true
+      nextVersion:
+        description: "The next version in <MAJOR>.<MINOR> format WITHOUT SNAPSHOT SUFFIX"
+        required: true
+
+permissions:
+  contents: read 
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: "Check release version"
+        run: |
+          expr "${{ github.event.inputs.releaseVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
+      - name: "Check next version"
+        run: |
+          expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
+      - uses: actions/checkout@v6
+        with:
+          token: ${{ secrets.QAMETA_CI }}
+
+      - name: "Configure CI Git User"
+        run: |
+          git config --global user.name qameta-ci
+          git config --global user.email qameta-ci@qameta.io
+      - name: "Set release version"
+        run: |
+          sed -i -e '/version=/s/.*/version=${{ github.event.inputs.releaseVersion }}/g' gradle.properties
+          cat gradle.properties
+      - name: "Commit release version and create tag"
+        run: |
+          git commit -am "release ${{ github.event.inputs.releaseVersion }}"
+          git tag ${{ github.event.inputs.releaseVersion }}
+          git push origin ${{ github.event.inputs.releaseVersion }}
+      - name: "Set next development version"
+        run: |
+          sed -i -e '/version=/s/.*/version=${{ github.event.inputs.nextVersion }}-SNAPSHOT/g' gradle.properties
+          cat gradle.properties
+      - name: "Commit next development version and push it"
+        run: |
+          git commit -am "set next development version ${{ github.event.inputs.nextVersion }}"
+          git push origin ${{ github.ref }}
+      - name: "Publish Github Release"
+        uses: octokit/request-action@v2.x
+        with:
+          route: POST /repos/${{ github.repository }}/releases
+          tag_name: ${{ github.event.inputs.releaseVersion }}
+          generate_release_notes: true
+          target_commitish: ${{ github.ref }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.QAMETA_CI }}
diff --git a/.gitignore b/.gitignore
index fe90411d6..b85107a90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,9 @@ out
 .gradletasknamecache
 
 #IDEA Files
-.idea
+.idea/*
+!.idea/vcs.xml
+!.idea/icon.png
 *.iml
 *.ipr
 
@@ -21,4 +23,4 @@ out
 .DS_Store
 
 #Netbeans files
-/.nb-gradle/
\ No newline at end of file
+/.nb-gradle/
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 000000000..252994657
Binary files /dev/null and b/.idea/icon.png differ
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..aeaa9e459
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/allure-framework/allure-java/issues/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
diff --git a/AUTHORS b/AUTHORS
index 0edbd3fb9..8263d9471 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
 The following authors have created the source code of "Allure Java"
-published and distributed by Qameta Software OÜ as the owner:
+published and distributed by Qameta Software Inc as the owner:
 
 * Dmitry Baev           <baev@qameta.io>
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 64bac5a9e..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,40 +0,0 @@
-pipeline {
-    agent { label 'java' }
-    parameters {
-        booleanParam(name: 'RELEASE', defaultValue: false, description: 'Perform release?')
-        string(name: 'RELEASE_VERSION', defaultValue: '', description: 'Release version')
-        string(name: 'NEXT_VERSION', defaultValue: '', description: 'Next version (without SNAPSHOT)')
-    }
-    stages {
-        stage('Build') {
-            steps {
-                sh './gradlew build'
-            }
-        }
-        stage('Release') {
-            when { expression { return params.RELEASE } }
-            steps {
-                withCredentials([usernamePassword(credentialsId: 'qameta-ci_bintray',
-                        usernameVariable: 'BINTRAY_USER', passwordVariable: 'BINTRAY_API_KEY')]) {
-                    sshagent(['qameta-ci_ssh']) {
-                        sh 'git checkout master && git pull origin master'
-                        sh "./gradlew release -Prelease.useAutomaticVersion=true " +
-                                "-Prelease.releaseVersion=${RELEASE_VERSION} " +
-                                "-Prelease.newVersion=${NEXT_VERSION}-SNAPSHOT"
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            allure results: [[path: '**/build/allure-results']]
-            deleteDir()
-        }
-
-        failure {
-            slackSend message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} failed (<${env.BUILD_URL}|Open>)",
-                    color: 'danger', teamDomain: 'qameta', channel: 'allure', tokenCredentialId: 'allure-channel'
-        }
-    }
-}
diff --git a/LICENSE b/LICENSE
index a5ff24fc6..aa0c10ae1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019 Qameta Software OÜ
+   Copyright 2016-2024 Qameta Software Inc
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+   limitations under the License.
diff --git a/README.md b/README.md
index e96e77409..e452787b3 100644
--- a/README.md
+++ b/README.md
@@ -1,171 +1,242 @@
-[license]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License 2.0"
-[blog]: https://qameta.io/blog
-[gitter]: https://gitter.im/allure-framework/allure-core
-[gitter-ru]: https://gitter.im/allure-framework/allure-ru
-[twitter]: https://twitter.com/QametaSoftware "Qameta Software"
-[twitter-team]: https://twitter.com/QametaSoftware/lists/team/members "Team"
-
-[bintray]: https://bintray.com/qameta/maven/allure-java "Bintray"
-[bintray-badge]: https://img.shields.io/bintray/v/qameta/maven/allure-java.svg?style=flat
-
-[CONTRIBUTING.md]: .github/CONTRIBUTING.md
-[docs]: https://docs.qameta.io/allure/2.0/
-
-# Allure Java Integrations [![bintray-badge][]][bintray]
-
-The repository contains new versions of adaptors for JVM-based test frameworks.
-
-All the artifacts are deployed to `https://dl.bintray.com/qameta/maven`.
-
-## TestNG
-
-The new TestNG adaptors is pretty much ready. To use the adaptor you should add the following dependency:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-testng</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-also you need to configure AspectJ weaver to support steps.
-
-## JUnit 4
-
-The first draft of a new JUnit 4 adaptor is ready. To use the adaptor you should add the following dependency:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-junit4</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-## JUnit 5
-
-To use JUnit 5 simply add the following dependency to your project:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-junit5</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-## Selenide
-
-Listener for Selenide, that logging steps for Allure:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-selenide</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-SelenideLogger.addListener("AllureSelenide", new AllureSelenide().screenshots(true).savePageSource(false));
-
-Capture selenium logs:
-SelenideLogger.addListener("AllureSelenide", new AllureSelenide().enableLogs(LogType.BROWSER, Level.ALL));
-https://github.com/SeleniumHQ/selenium/wiki/Logging
-```
-
-
-## Rest Assured
-
-Filter for rest-assured http client, that generates attachment for allure.
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-rest-assured</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.filter(new AllureRestAssured())
-```
-You can specify custom templates, which should be placed in src/main/resources/tpl folder:
-```
-.filter(new AllureRestAssured()
-        .withRequestTemplate("custom-http-request.ftl")
-        .withResponseTemplate("custom-http-response.ftl"))
-```
-
-## OkHttp
-
-Interceptor for OkHttp client, that generates attachment for allure.
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-okhttp3</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.addInterceptor(new AllureOkHttp3())
-```
-You can specify custom templates, which should be placed in src/main/resources/tpl folder:
-```
-.addInterceptor(new AllureOkHttp3()
-                .withRequestTemplate("custom-http-request.ftl")
-                .withResponseTemplate("custom-http-response.ftl"))
-
-```
-
-## Http client
-
-Interceptors for Apache HTTP client, that generates attachment for allure.
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-httpclient</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.addInterceptorFirst(new AllureHttpClientRequest())
-.addInterceptorLast(new AllureHttpClientResponse());
-```
-
-## JAX-RS Filter
-
-Filter that can be used with JAX-RS compliant clients such as RESTeasy and Jersey
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-jax-rs</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.register(AllureJaxRs.class)
-```
-
-## JsonUnit
-JsonPatchMatcher is extension of JsonUnit matcher, that generates pretty html attachment for differences based on [json diff patch](https://github.com/benjamine/jsondiffpatch/blob/master/docs/deltas.md).
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-jsonunit</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
+[license]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License 2.0"
+[blog]: https://qameta.io/blog
+[gitter]: https://gitter.im/allure-framework/allure-core
+[gitter-ru]: https://gitter.im/allure-framework/allure-ru
+[twitter]: https://twitter.com/QametaSoftware "Qameta Software"
+[twitter-team]: https://twitter.com/QametaSoftware/lists/team/members "Team"
+
+[CONTRIBUTING.md]: .github/CONTRIBUTING.md
+[docs]: https://allurereport.org/docs/
+
+# Allure Java Integrations 
+
+[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yml) 
+[![Allure Java](https://img.shields.io/github/release/allure-framework/allure-java.svg)](https://github.com/allure-framework/allure-java/releases/latest)
+
+> The repository contains new versions of adaptors for JVM-based test frameworks.
+
+[<img src="https://allurereport.org/public/img/allure-report.svg" height="85px" alt="Allure Report logo" align="right" />](https://allurereport.org "Allure Report")
+
+- Learn more about Allure Report at [https://allurereport.org](https://allurereport.org)
+- 📚 [Documentation](https://allurereport.org/docs/) – discover official documentation for Allure Report
+- ❓ [Questions and Support](https://github.com/orgs/allure-framework/discussions/categories/questions-support) – get help from the team and community
+- 📢 [Official announcements](https://github.com/orgs/allure-framework/discussions/categories/announcements) –  stay updated with our latest news and updates
+- 💬 [General Discussion](https://github.com/orgs/allure-framework/discussions/categories/general-discussion) – engage in casual conversations, share insights and ideas with the community
+- 🖥️ [Live Demo](https://demo.allurereport.org/) — explore a live example of Allure Report in action
+
+---
+## TestNG
+
+- 🚀 Documentation — https://allurereport.org/docs/testng/
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Atestng
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+
+## JUnit 4
+
+- 🚀 Documentation — work in progress
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Ajunit4
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+- 
+## JUnit 5
+
+- 🚀 Documentation — https://allurereport.org/docs/junit5/
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Ajunit5
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+
+## Cucumber JVM
+
+- 🚀 Documentation — https://allurereport.org/docs/cucumberjvm/
+- 📚 Example project — https://github.com/allure-examples?q=cucumber&type=all&language=java
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+
+## Spock
+
+- 🚀 Documentation — https://allurereport.org/docs/spock/
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Aspock
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+  
+## Selenide
+
+Listener for Selenide, that logging steps for Allure:
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-selenide</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+SelenideLogger.addListener("AllureSelenide", new AllureSelenide().screenshots(true).savePageSource(false));
+
+Capture selenium logs:
+SelenideLogger.addListener("AllureSelenide", new AllureSelenide().enableLogs(LogType.BROWSER, Level.ALL));
+https://github.com/SeleniumHQ/selenium/wiki/Logging
+```
+
+
+## Rest Assured
+
+Filter for rest-assured http client, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-rest-assured</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.filter(new AllureRestAssured())
+```
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
+```
+.filter(new AllureRestAssured()
+        .withRequestTemplate("custom-http-request.ftl")
+        .withResponseTemplate("custom-http-response.ftl"))
+```
+
+## OkHttp
+
+Interceptor for OkHttp client, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-okhttp3</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.addInterceptor(new AllureOkHttp3())
+```
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
+```
+.addInterceptor(new AllureOkHttp3()
+                .withRequestTemplate("custom-http-request.ftl")
+                .withResponseTemplate("custom-http-response.ftl"))
+
+```
+
+## gRPC
+
+Interceptor for gRPC stubs, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-grpc</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.newBlockingStub(channel).withInterceptors(new AllureGrpc());
+```
+You can enable interception of response metadata (disabled by default)
+```
+.withInterceptors(new AllureGrpc()
+                .interceptResponseMetadata(true))
+```
+By default, a step will be marked as failed in case that response contains any statuses except 0(OK).
+You can change this behavior, for example, for negative scenarios
+```
+.withInterceptors(new AllureGrpc()
+                .markStepFailedOnNonZeroCode(false))
+```
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
+```
+.withInterceptors(new AllureGrpc()
+                .setRequestTemplate("custom-http-request.ftl")
+                .setResponseTemplate("custom-http-response.ftl"))
+```
+
+## Http client
+
+Interceptors for Apache HTTP client, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-httpclient</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.addInterceptorFirst(new AllureHttpClientRequest())
+.addInterceptorLast(new AllureHttpClientResponse());
+```
+
+## Http client 5
+Interceptors for Apache [httpclient5](https://hc.apache.org/httpcomponents-client-5.2.x/index.html). 
+Additional info can be found in module `allure-httpclient5`
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-httpclient5</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```java
+final HttpClientBuilder builder = HttpClientBuilder.create()
+        .addRequestInterceptorFirst(new AllureHttpClient5Request("your-request-template-attachment.ftl"))
+        .addResponseInterceptorLast(new AllureHttpClient5Response("your-response-template-attachment.ftl"));
+```
+
+## JAX-RS Filter
+
+Filter that can be used with JAX-RS compliant clients such as RESTeasy and Jersey
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-jax-rs</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.register(AllureJaxRs.class)
+```
+
+## JsonUnit
+JsonPatchMatcher is extension of JsonUnit matcher, that generates pretty html attachment for differences based on [json diff patch](https://github.com/benjamine/jsondiffpatch/blob/master/docs/deltas.md).
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-jsonunit</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+## Awaitility
+Extended logging for poling and ignored exceptions for [awaitility](https://github.com/awaitility/awaitility). For 
+more usage example look into module `allure-awaitility`
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-awaitility</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+```
+
diff --git a/allure-assertj/build.gradle.kts b/allure-assertj/build.gradle.kts
index e8e064ed9..e38cca0ea 100644
--- a/allure-assertj/build.gradle.kts
+++ b/allure-assertj/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure AssertJ Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("org.aspectj:aspectjrt")
     compileOnly("org.assertj:assertj-core")
@@ -25,7 +22,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
index e54ca815e..128791172 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ protected AllureLifecycle initialValue() {
         }
     };
 
-    @Pointcut("execution(public org.assertj.core.api.AbstractAssert.new(..))")
+    @Pointcut("execution(!private org.assertj.core.api.AbstractAssert.new(..))")
     public void anyAssertCreation() {
         //pointcut body, should be empty
     }
diff --git a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
index 7a48210c8..57ddef240 100644
--- a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
+++ b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -82,11 +83,28 @@ void shouldHandleByteArrayObject() {
                 .extracting(StepResult::getName)
                 .containsExactly(
                         "assertThat '<BINARY>'",
-                        "as 'Byte array object []'",
+                        "describedAs 'Byte array object'",
                         "isEqualTo '<BINARY>'"
                 );
     }
 
+    @AllureFeatures.Steps
+    @Test
+    void shouldHandleCollections() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(Arrays.asList("a", "b"))
+                .containsExactly("a", "b");
+        }, AllureAspectJ::setLifecycle);
+
+        assertThat(results.getTestResults())
+            .flatExtracting(TestResult::getSteps)
+            .extracting(StepResult::getName)
+            .containsExactly(
+                "assertThatList '[a, b]'",
+                "containsExactly '[a, b]'"
+            );
+    }
+
     @AllureFeatures.Steps
     @Test
     void softAssertions() {
diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts
index bfbe95e7c..c5010a3c0 100644
--- a/allure-attachments/build.gradle.kts
+++ b/allure-attachments/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Attachments"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.freemarker:freemarker")
     testImplementation("org.apache.commons:commons-lang3")
@@ -26,7 +23,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
index c8fe7c111..50af67ea4 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
index 86b318a05..5c6d09f34 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
  *
  * @author charlie (Dmitry Baev).
  */
+@FunctionalInterface
 public interface AttachmentData {
 
     String getName();
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
index cfc93c716..99129f89a 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
  * @param <T> the type of attachment data.
  * @author charlie (Dmitry Baev).
  */
+@FunctionalInterface
 public interface AttachmentProcessor<T extends AttachmentData> {
 
     void addAttachment(T attachmentData, AttachmentRenderer<T> renderer);
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
index 5d702bffa..daaf9cc91 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
index 1d239331e..2b6f5b1a5 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
  * @author charlie (Dmitry Baev).
  */
 @SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures")
+@FunctionalInterface
 public interface AttachmentRenderer<T extends AttachmentData> {
 
     AttachmentContent render(T attachmentData) throws AttachmentRenderException;
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
index ab26abbb6..ccdc978a8 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
index dc57e9a01..652c8ca5f 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
index 9179f3ed7..50ac53924 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import freemarker.template.TemplateExceptionHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.StringWriter;
 import java.io.Writer;
@@ -27,6 +30,8 @@
  */
 public class FreemarkerAttachmentRenderer implements AttachmentRenderer<AttachmentData> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(FreemarkerAttachmentRenderer.class);
+
     private final Configuration configuration;
 
     private final String templateName;
@@ -36,6 +41,7 @@ public FreemarkerAttachmentRenderer(final String templateName) {
         this.configuration = new Configuration(Configuration.VERSION_2_3_23);
         this.configuration.setLocalizedLookup(false);
         this.configuration.setTemplateUpdateDelayMilliseconds(0);
+        this.configuration.setTemplateExceptionHandler(TemplateExceptionHandler.HTML_DEBUG_HANDLER);
         this.configuration.setClassLoaderForTemplateLoading(getClass().getClassLoader(), "tpl");
     }
 
@@ -46,6 +52,7 @@ public DefaultAttachmentContent render(final AttachmentData data) {
             template.process(Collections.singletonMap("data", data), writer);
             return new DefaultAttachmentContent(writer.toString(), "text/html", ".html");
         } catch (Exception e) {
+            LOGGER.debug(data.toString());
             throw new AttachmentRenderException("Could't render http attachment file", e);
         }
     }
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
index 831b2a5da..a51052cf7 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 package io.qameta.allure.attachment.http;
 
 import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.util.ObjectUtils;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -40,9 +42,18 @@ public class HttpRequestAttachment implements AttachmentData {
 
     private final Map<String, String> cookies;
 
+    private final Map<String, String> formParams;
+
     public HttpRequestAttachment(final String name, final String url, final String method,
                                  final String body, final String curl, final Map<String, String> headers,
                                  final Map<String, String> cookies) {
+        this(name, url, method, body, curl, headers, cookies, Collections.emptyMap());
+    }
+
+    @SuppressWarnings("checkstyle:parameternumber")
+    public HttpRequestAttachment(final String name, final String url, final String method,
+                                 final String body, final String curl, final Map<String, String> headers,
+                                 final Map<String, String> cookies, final Map<String, String> formParams) {
         this.name = name;
         this.url = url;
         this.method = method;
@@ -50,6 +61,7 @@ public HttpRequestAttachment(final String name, final String url, final String m
         this.curl = curl;
         this.headers = headers;
         this.cookies = cookies;
+        this.formParams = formParams;
     }
 
     public String getUrl() {
@@ -72,6 +84,10 @@ public Map<String, String> getCookies() {
         return cookies;
     }
 
+    public Map<String, String> getFormParams() {
+        return formParams;
+    }
+
     public String getCurl() {
         return curl;
     }
@@ -81,10 +97,21 @@ public String getName() {
         return name;
     }
 
+    @Override
+    public String toString() {
+        return "HttpRequestAttachment("
+                + "\n\tname=" + this.name
+                + ",\n\turl=" + this.url
+                + ",\n\tbody=" + this.body
+                + ",\n\theaders=" + ObjectUtils.mapToString(this.headers)
+                + ",\n\tcookies=" + ObjectUtils.mapToString(this.cookies)
+                + ",\n\tformParams=" + ObjectUtils.mapToString(this.formParams)
+                + "\n)";
+    }
+
     /**
      * Builder for HttpRequestAttachment.
      */
-    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
     public static final class Builder {
 
         private final String name;
@@ -99,6 +126,8 @@ public static final class Builder {
 
         private final Map<String, String> cookies = new HashMap<>();
 
+        private final Map<String, String> formParams = new HashMap<>();
+
         private Builder(final String name, final String url) {
             Objects.requireNonNull(name, "Name must not be null value");
             Objects.requireNonNull(url, "Url must not be null value");
@@ -148,6 +177,12 @@ public Builder setBody(final String body) {
             return this;
         }
 
+        public Builder setFormParams(final Map<String, String> formParams) {
+            Objects.requireNonNull(formParams, "Form params must not be null value");
+            this.formParams.putAll(formParams);
+            return this;
+        }
+
         /**
          * Use setter method instead.
          * @deprecated scheduled for removal in 3.0 release
@@ -203,7 +238,7 @@ public Builder withBody(final String body) {
         }
 
         public HttpRequestAttachment build() {
-            return new HttpRequestAttachment(name, url, method, body, getCurl(), headers, cookies);
+            return new HttpRequestAttachment(name, url, method, body, getCurl(), headers, cookies, formParams);
         }
 
         private String getCurl() {
@@ -214,6 +249,7 @@ private String getCurl() {
             builder.append(" '").append(url).append('\'');
             headers.forEach((key, value) -> appendHeader(builder, key, value));
             cookies.forEach((key, value) -> appendCookie(builder, key, value));
+            formParams.forEach((key, value) -> appendFormParams(builder, key, value));
 
             if (Objects.nonNull(body)) {
                 builder.append(" -d '").append(body).append('\'');
@@ -236,5 +272,13 @@ private static void appendCookie(final StringBuilder builder, final String key,
                     .append(value)
                     .append('\'');
         }
+
+        private static void appendFormParams(final StringBuilder builder, final String key, final String value) {
+            builder.append(" --form '")
+                    .append(key)
+                    .append('=')
+                    .append(value)
+                    .append('\'');
+        }
     }
 }
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
index 0b5ef9841..d606af57e 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.qameta.allure.attachment.http;
 
 import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.util.ObjectUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -74,10 +75,21 @@ public Map<String, String> getCookies() {
         return cookies;
     }
 
+    @Override
+    public String toString() {
+        return "HttpResponseAttachment("
+                + "\n\tname=" + this.name
+                + ",\n\turl=" + this.url
+                + ",\n\tbody=" + this.body
+                + ",\n\tresponseCode=" + this.responseCode
+                + ",\n\theaders=" + ObjectUtils.mapToString(this.headers)
+                + ",\n\tcookies=" + ObjectUtils.mapToString(this.cookies)
+                + "\n)";
+    }
+
     /**
      * Builder for HttpRequestAttachment.
      */
-    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
     public static final class Builder {
 
         private final String name;
@@ -146,6 +158,7 @@ public Builder setBody(final String body) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -155,6 +168,7 @@ public Builder withUrl(final String url) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -164,6 +178,7 @@ public Builder withResponseCode(final int responseCode) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -173,6 +188,7 @@ public Builder withHeader(final String name, final String value) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -182,6 +198,7 @@ public Builder withHeaders(final Map<String, String> headers) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -191,6 +208,7 @@ public Builder withCookie(final String name, final String value) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -200,6 +218,7 @@ public Builder withCookies(final Map<String, String> cookies) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
diff --git a/allure-attachments/src/main/resources/tpl/http-request.ftl b/allure-attachments/src/main/resources/tpl/http-request.ftl
index 5ef76b521..935c1c91a 100644
--- a/allure-attachments/src/main/resources/tpl/http-request.ftl
+++ b/allure-attachments/src/main/resources/tpl/http-request.ftl
@@ -3,36 +3,45 @@
 <div><#if data.method??>${data.method}<#else>GET</#if> to <#if data.url??>${data.url}<#else>Unknown</#if></div>
 
 <#if data.body??>
-<h4>Body</h4>
-<div>
+    <h4>Body</h4>
+    <div>
     <pre class="preformated-text">
-    ${data.body}
+    <#t>${data.body}
     </pre>
-</div>
+    </div>
 </#if>
 
 <#if (data.headers)?has_content>
-<h4>Headers</h4>
-<div>
-    <#list data.headers as name, value>
-        <div>${name}: ${value}</div>
-    </#list>
-</div>
+    <h4>Headers</h4>
+    <div>
+        <#list data.headers as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
 </#if>
 
 
 <#if (data.cookies)?has_content>
-<h4>Cookies</h4>
-<div>
-    <#list data.cookies as name, value>
-        <div>${name}: ${value}</div>
-    </#list>
-</div>
+    <h4>Cookies</h4>
+    <div>
+        <#list data.cookies as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
 </#if>
 
 <#if data.curl??>
-<h4>Curl</h4>
-<div>
-${data.curl}
-</div>
+    <h4>Curl</h4>
+    <div>
+        ${data.curl}
+    </div>
+</#if>
+
+<#if (data.formParams)?has_content>
+    <h4>FormParams</h4>
+    <div>
+        <#list data.formParams as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
 </#if>
diff --git a/allure-attachments/src/main/resources/tpl/http-response.ftl b/allure-attachments/src/main/resources/tpl/http-response.ftl
index 2bc55de9f..91fed7287 100644
--- a/allure-attachments/src/main/resources/tpl/http-response.ftl
+++ b/allure-attachments/src/main/resources/tpl/http-response.ftl
@@ -7,7 +7,7 @@
 <h4>Body</h4>
 <div>
     <pre class="preformated-text">
-    ${data.body}
+    <#t>${data.body}
     </pre>
 </div>
 </#if>
@@ -16,7 +16,7 @@
 <h4>Headers</h4>
 <div>
     <#list data.headers as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
@@ -26,7 +26,7 @@
 <h4>Cookies</h4>
 <div>
     <#list data.cookies as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
index 1283d6116..a1d2def2e 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
index 75ddac32d..0a773e59f 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@
 package io.qameta.allure.attachment;
 
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
+import io.qameta.allure.attachment.http.HttpResponseAttachment;
 import io.qameta.allure.test.AllureFeatures;
 import org.junit.jupiter.api.Test;
 
 import static io.qameta.allure.attachment.testdata.TestData.randomHttpRequestAttachment;
+import static io.qameta.allure.attachment.testdata.TestData.randomHttpResponseAttachment;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -27,6 +29,13 @@
  */
 class FreemarkerAttachmentRendererTest {
 
+    private static final String CONTENT = "content";
+    private static final String CONTENT_TYPE = "contentType";
+    private static final String TEXT_HTML = "text/html";
+    private static final String FILE_EXTENSION = "fileExtension";
+    private static final String HTML = ".html";
+
+
     @AllureFeatures.Attachments
     @Test
     void shouldRenderRequestAttachment() {
@@ -35,21 +44,21 @@ void shouldRenderRequestAttachment() {
                 .render(data);
 
         assertThat(content)
-                .hasFieldOrPropertyWithValue("contentType", "text/html")
-                .hasFieldOrPropertyWithValue("fileExtension", ".html")
-                .hasFieldOrProperty("content");
+                .hasFieldOrPropertyWithValue(CONTENT_TYPE, TEXT_HTML)
+                .hasFieldOrPropertyWithValue(FILE_EXTENSION, HTML)
+                .hasFieldOrProperty(CONTENT);
     }
 
     @AllureFeatures.Attachments
     @Test
     void shouldRenderResponseAttachment() {
-        final HttpRequestAttachment data = randomHttpRequestAttachment();
+        final HttpResponseAttachment data = randomHttpResponseAttachment();
         final DefaultAttachmentContent content = new FreemarkerAttachmentRenderer("http-response.ftl")
                 .render(data);
 
         assertThat(content)
-                .hasFieldOrPropertyWithValue("contentType", "text/html")
-                .hasFieldOrPropertyWithValue("fileExtension", ".html")
-                .hasFieldOrProperty("content");
+                .hasFieldOrPropertyWithValue(CONTENT_TYPE, TEXT_HTML)
+                .hasFieldOrPropertyWithValue(FILE_EXTENSION, HTML)
+                .hasFieldOrProperty(CONTENT);
     }
 }
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
new file mode 100644
index 000000000..fbc2e6611
--- /dev/null
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
@@ -0,0 +1,87 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.attachment;
+
+import io.qameta.allure.attachment.http.HttpRequestAttachment;
+import io.qameta.allure.test.AllureFeatures;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
+import static io.qameta.allure.attachment.testdata.TestData.negativeHttpRequestAttachment;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+class NegativeFreemarkerAttachmentRendererTest {
+
+    private static final String TEMPLATE_FOR_EXCEPTION = "body-npe-non-safe-attachment.ftl";
+
+    private PrintStream realSysOut;
+    private ByteArrayOutputStream sysOutBuffer;
+
+    @BeforeEach
+    void setUpSysOut() throws UnsupportedEncodingException {
+        realSysOut = System.err;
+        sysOutBuffer = new ByteArrayOutputStream();
+        System.setErr(new PrintStream(sysOutBuffer, false, StandardCharsets.UTF_8.toString()));
+    }
+
+    @AfterEach
+    void rollBackSysOut() {
+        System.setErr(realSysOut);
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldThrowExceptionalSituationsForFreeMarketRendererWithIncorrectAttachmentData() {
+        assertThrows(AttachmentRenderException.class, () -> {
+            final HttpRequestAttachment data = negativeHttpRequestAttachment();
+            new FreemarkerAttachmentRenderer(TEMPLATE_FOR_EXCEPTION).render(data);
+        });
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldExplainExceptionalSituationsForFreeMarketRenderer() throws UnsupportedEncodingException {
+        try {
+            final HttpRequestAttachment data = negativeHttpRequestAttachment();
+            new FreemarkerAttachmentRenderer(TEMPLATE_FOR_EXCEPTION).render(data);
+        } catch (Exception ignored) {
+            // for test purposes
+        }
+        assertThat(sysOutBuffer.toString(StandardCharsets.UTF_8.toString()))
+                .contains("SEVERE: Error executing FreeMarker template")
+                .contains("FreeMarker template error:")
+                .contains("The following has evaluated to null or missing:")
+                .contains("==> data.body")
+                .contains("[in template \"body-npe-non-safe-attachment.ftl\" at line 8, column 11]")
+                .contains("\t- Failed at: ${data.body.size}")
+                .contains("io.qameta.allure.attachment.FreemarkerAttachmentRenderer - HttpRequestAttachment")
+                .contains("\tname=null,")
+                .contains("\turl=null,")
+                .contains("\tbody=null,")
+                .contains("\theaders={},")
+                .contains("\tcookies={}");
+    }
+}
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
index 26eba1c6f..f5933c6db 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -69,6 +69,20 @@ public static Map<String, String> randomMap() {
         final Map<String, String> map = new HashMap<>();
         map.put(randomString(), randomString());
         map.put(randomString(), randomString());
+        map.put(randomString(), null);
         return map;
     }
+
+    public static HttpRequestAttachment negativeHttpRequestAttachment() {
+        return new HttpRequestAttachment(
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null
+        );
+    }
+
 }
diff --git a/allure-attachments/src/test/resources/tpl/body-npe-non-safe-attachment.ftl b/allure-attachments/src/test/resources/tpl/body-npe-non-safe-attachment.ftl
new file mode 100644
index 000000000..813425567
--- /dev/null
+++ b/allure-attachments/src/test/resources/tpl/body-npe-non-safe-attachment.ftl
@@ -0,0 +1,36 @@
+<#ftl output_format="HTML">
+<#-- @ftlvariable name="data" type="io.qameta.allure.attachment.http.HttpRequestAttachment" -->
+<div><#if data.method??>${data.method}<#else>GET</#if> to <#if data.url??>${data.url}<#else>Unknown</#if></div>
+
+<h4>Body</h4>
+<div>
+    <pre class="preformatted-text">
+    <#t>${data.body.size}
+    </pre>
+</div>
+
+<#if (data.headers)?has_content>
+    <h4>Headers</h4>
+    <div>
+        <#list data.headers as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
+</#if>
+
+
+<#if (data.cookies)?has_content>
+    <h4>Cookies</h4>
+    <div>
+        <#list data.cookies as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
+</#if>
+
+<#if data.curl??>
+    <h4>Curl</h4>
+    <div>
+        ${data.curl}
+    </div>
+</#if>
diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-awaitility/build.gradle.kts
similarity index 56%
rename from allure-cucumber3-jvm/build.gradle.kts
rename to allure-awaitility/build.gradle.kts
index 681f1ab7c..3c9ed6c79 100644
--- a/allure-cucumber3-jvm/build.gradle.kts
+++ b/allure-awaitility/build.gradle.kts
@@ -1,17 +1,16 @@
-description = "Allure CucumberJVM 3.0 Integration"
+description = "Allure Awaitlity Integration"
 
 val agent: Configuration by configurations.creating
 
-val cucumberVersion = "3.0.2"
+val awaitilityVersion = "4.3.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("io.cucumber:cucumber-core:$cucumberVersion")
-    implementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("commons-io:commons-io")
-    testImplementation("io.github.glytching:junit-extensions")
+    compileOnly("org.awaitility:awaitility:$awaitilityVersion")
+    testImplementation("javax.annotation:javax.annotation-api")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.awaitility:awaitility:$awaitilityVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
@@ -22,14 +21,11 @@ dependencies {
 tasks.jar {
     manifest {
         attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.cucumber3jvm"
+                "Automatic-Module-Name" to "io.qameta.allure.awaitility"
         ))
     }
 }
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-awaitility/readme.md b/allure-awaitility/readme.md
new file mode 100644
index 000000000..1fcb34691
--- /dev/null
+++ b/allure-awaitility/readme.md
@@ -0,0 +1,71 @@
+## Allure-awaitility
+Extended logging for poling and ignored exceptions for [awaitility](https://github.com/awaitility/awaitility)
+
+
+## Wiki
+For more information about awaitility highly recommended look into [awaitility usage guide](https://github.com/awaitility/awaitility/wiki/Usage)
+
+
+### Configuration examples
+Single line for all awaitility conditions in project 
+```java
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+```
+
+And another line to prevent breaking allure lifecycle for Steps inside Awaitility evaluations
+```java
+Awaitility.pollInSameThread();
+```
+
+Moreover, it's possible logging only few unstable conditions with method `.conditionEvaluationListener()`
+```java
+final AtomicInteger atomicInteger = new AtomicInteger(0);
+await().with()
+        .conditionEvaluationListener(new AllureAwaitilityListener())
+        .alias("Checking that important counter reached value around 3")
+        .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+        .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+        .until(atomicInteger::getAndIncrement, is(3));
+```
+
+How it looks like:
+1. Top-level step with condition evaluation definition such as alias or default information.
+2. Second-level steps with poling process information
+3. Optional second-level step with timeout information
+4. Optional second-level steps with ignored information
+
+
+### TimeUnit
+Most awaitility users count time as milliseconds, but you can feel free to change print poll information.
+```java
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener().setUnit(TimeUnit.SECONDS));
+```
+
+
+### Exceptions handling
+By default, it's not possible to handle and log any exceptions, but you can try to 
+[ignore](https://github.com/awaitility/awaitility/wiki/Usage#ignoring-exceptions) and log ignored exceptions. 
+
+```java
+final AtomicInteger atomicInteger = new AtomicInteger(0);
+await().with()
+        .ignoreExceptions() //required
+        .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+        .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
+        .until(() -> {
+            if (atomicInteger.getAndIncrement() != 3) {
+                //this exception will be ignored by awaitility, but logged into Allure
+                throw new RuntimeException("Something wrong happens");
+            } else {
+                return true;
+            }
+        });
+```
+
+Then, if you are not impressed with the large volume of logged exceptions, there is the way to disable logging for 
+ignored exceptions globally.
+
+```java
+Awaitility.ignoreExceptionsByDefault();
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener().setLogIgnoredExceptions(false));
+```
\ No newline at end of file
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
new file mode 100644
index 000000000..01b793cf5
--- /dev/null
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
@@ -0,0 +1,257 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.awaitility;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionEvaluationListener;
+import org.awaitility.core.ConditionFactory;
+import org.awaitility.core.EvaluatedCondition;
+import org.awaitility.core.IgnoredException;
+import org.awaitility.core.StartEvaluationEvent;
+import org.awaitility.core.TimeoutEvent;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * <p>
+ * Class implements Awaitility condition listener to log all awaiting and polls as {@link io.qameta.allure.Step}.
+ * </p>
+ * <p>
+ * Usage with single condition
+ * <pre>
+ * <code>
+ * Awaitility.await()
+ *     .conditionEvaluationListener(new AllureAwaitilityListener())
+ *     .until(() -&gt; somethingHappen());
+ * </code>
+ * </pre>
+ * </p>
+ * <p>
+ * Usage globally for all conditions
+ * <pre>
+ * <code>
+ * Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+ * </code>
+ * </pre>
+ * </p>
+ *
+ * @author a-simeshin (Simeshin Artem)
+ * @see org.awaitility.core.ConditionEvaluationListener
+ * @see Awaitility#setDefaultConditionEvaluationListener(ConditionEvaluationListener)
+ * @see ConditionFactory#conditionEvaluationListener(ConditionEvaluationListener)
+ * @see <a href="https://github.com/awaitility/awaitility/wiki/Usage#condition-evaluation-listener"> awaitlity wiki</a>
+ */
+@SuppressWarnings("unused")
+public class AllureAwaitilityListener implements ConditionEvaluationListener<Object> {
+
+    private TimeUnit unit;
+    private boolean logIgnoredExceptions;
+    private final String onStartStepTextPattern;
+    private final String onSatisfiedStepTextPattern;
+    private final String onAwaitStepTextPattern;
+    private final String onTimeoutStepTextPattern;
+    private final String onExceptionStepTextPattern;
+
+    private String currentConditionStepUUID;
+
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE
+            = new InheritableThreadLocal<AllureLifecycle>() {
+        @Override
+        protected AllureLifecycle initialValue() {
+            return Allure.getLifecycle();
+        }
+    };
+
+    public static AllureLifecycle getLifecycle() {
+        return LIFECYCLE.get();
+    }
+
+    /**
+     * Default all args constructor with default params.
+     */
+    public AllureAwaitilityListener() {
+        this.unit = MILLISECONDS;
+        this.logIgnoredExceptions = true;
+        this.onStartStepTextPattern = "Awaitility: %s";
+        this.onSatisfiedStepTextPattern = "%s after %d %s (remaining time %d %s, last poll interval was %s)";
+        this.onAwaitStepTextPattern = "%s (elapsed time %d %s, remaining time %d %s (last poll interval was %s))";
+        this.onTimeoutStepTextPattern = "Condition timeout. %s";
+        this.onExceptionStepTextPattern = "Exception ignored. %s";
+    }
+
+    /**
+     * Set default timeunit used in awaitility in project for properly printing.
+     *
+     * @param unit default timeunit in project
+     * @return this factory
+     */
+    public AllureAwaitilityListener setUnit(final TimeUnit unit) {
+        this.unit = unit;
+        return this;
+    }
+
+    /**
+     * Set logging ignored exceptions. True by default.
+     *
+     * @param logging to log or not
+     * @return this factory
+     */
+    public AllureAwaitilityListener setLogIgnoredExceptions(final boolean logging) {
+        this.logIgnoredExceptions = logging;
+        return this;
+    }
+
+    /**
+     * Method creates top-level step with short description about condition.
+     *
+     * @param startEvaluationEvent condition evaluation started
+     */
+    @Override
+    public void beforeEvaluation(final StartEvaluationEvent<Object> startEvaluationEvent) {
+        currentConditionStepUUID = UUID.randomUUID().toString();
+        final String nameWoAlias = String.format(onStartStepTextPattern, startEvaluationEvent.getDescription());
+        final String nameWithAlias = String.format(onStartStepTextPattern, startEvaluationEvent.getAlias());
+        final String stepName = startEvaluationEvent.getAlias() != null ? nameWithAlias : nameWoAlias;
+        getLifecycle().startStep(
+                currentConditionStepUUID,
+                new StepResult()
+                        .setName(stepName)
+                        .setDescription("Awaitility condition started")
+                        .setStatus(Status.FAILED)
+        );
+    }
+
+    /**
+     * Logging timeout evaluation result. Method should create second-level step with useful info about timeout.
+     *
+     * @param timeoutEvent poling ended with timeout
+     */
+    @Override
+    public void onTimeout(final TimeoutEvent timeoutEvent) {
+        getLifecycle().updateStep(awaitilityCondition -> {
+            final String currentTimeoutStepUUID = UUID.randomUUID().toString();
+            getLifecycle().startStep(
+                    currentConditionStepUUID,
+                    currentTimeoutStepUUID,
+                    new StepResult()
+                            .setName(String.format(onTimeoutStepTextPattern, timeoutEvent.getDescription()))
+                            .setDescription("Awaitility condition timeout")
+                            .setStatus(Status.BROKEN)
+            );
+            getLifecycle().stopStep(currentTimeoutStepUUID);
+        });
+        getLifecycle().stopStep(currentConditionStepUUID);
+    }
+
+    /**
+     * Logging any evaluation result. Method should create second-level step with evaluation result and useful info.
+     *
+     * @param condition evaluation result for poling iteration
+     */
+    @Override
+    public void conditionEvaluated(final EvaluatedCondition<Object> condition) {
+        final String description = condition.getDescription();
+        final long elapsedTime = unit.convert(condition.getElapsedTimeInMS(), MILLISECONDS);
+        final long remainingTime = unit.convert(condition.getRemainingTimeInMS(), MILLISECONDS);
+        final String unitAsString = unit.toString().toLowerCase();
+
+        final String message = String.format(
+                condition.isSatisfied() ? onSatisfiedStepTextPattern : onAwaitStepTextPattern,
+                description,
+                elapsedTime,
+                unitAsString,
+                remainingTime,
+                unitAsString,
+                new TemporalDuration(condition.getPollInterval())
+        );
+
+        getLifecycle().updateStep(awaitilityCondition -> {
+            final String lastAwaitStepUUID = UUID.randomUUID().toString();
+            getLifecycle().startStep(
+                    currentConditionStepUUID,
+                    lastAwaitStepUUID,
+                    new StepResult()
+                            .setName(message)
+                            .setDescription("Awaitility condition satisfied or not, but awaiting still in progress")
+                            .setStatus(Status.PASSED)
+            );
+            getLifecycle().stopStep(lastAwaitStepUUID);
+            if (condition.isSatisfied()) {
+                awaitilityCondition.setStatus(Status.PASSED);
+                getLifecycle().stopStep(currentConditionStepUUID);
+            }
+        });
+    }
+
+    /**
+     * Logging ignored exceptions while poling conditions. Active only with
+     * <pre><code>await().with().ignoreExceptions()</code></pre>
+     * or
+     * <pre><code>Awaitility.ignoreExceptionsByDefault()</code></pre>
+     *
+     * @param ignoredException ignored exception
+     * @see Awaitility#ignoreExceptionsByDefault()
+     * @see Awaitility#ignoreExceptionByDefault(Class)
+     * @see ConditionFactory#ignoreExceptions()
+     * @see ConditionFactory#ignoreException(Class)
+     * @see <a href="https://github.com/awaitility/awaitility/wiki/Usage#ignoring-exceptions">awaitlity wiki</a>
+     */
+    @Override
+    public void exceptionIgnored(final IgnoredException ignoredException) {
+        if (logIgnoredExceptions) {
+            getLifecycle().updateStep(awaitilityCondition -> {
+                final String currentExceptionIgnoredStepUUID = UUID.randomUUID().toString();
+                final String message = String.format(
+                        onExceptionStepTextPattern, ignoredException.getThrowable().getMessage());
+                final StringWriter stringWriter = new StringWriter();
+                ignoredException.getThrowable().printStackTrace(new PrintWriter(stringWriter));
+                final String stackTrace = stringWriter.toString();
+                getLifecycle().startStep(
+                        currentConditionStepUUID,
+                        currentExceptionIgnoredStepUUID,
+                        new StepResult()
+                                .setName(message)
+                                .setDescription("Exception occurred and ignored, but awaiting still in progress")
+                                .setStatus(Status.SKIPPED)
+                );
+                getLifecycle().addAttachment(
+                        ignoredException.getThrowable().getMessage(), "text/plain", ".txt",
+                        stackTrace.getBytes(StandardCharsets.UTF_8));
+                getLifecycle().stopStep(currentExceptionIgnoredStepUUID);
+            });
+        }
+    }
+
+    /**
+     * For tests only.
+     *
+     * @param allure allure lifecycle to set
+     */
+    public static void setLifecycle(final AllureLifecycle allure) {
+        LIFECYCLE.set(allure);
+    }
+
+}
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
new file mode 100644
index 000000000..d549ee811
--- /dev/null
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.awaitility;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalField;
+import java.time.temporal.UnsupportedTemporalTypeException;
+
+import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.HOUR_OF_DAY;
+import static java.time.temporal.ChronoField.MILLI_OF_SECOND;
+import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
+import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
+import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
+import static java.time.temporal.ChronoField.YEAR;
+
+/**
+ * Class helper for Duration printing purposes.
+ */
+public class TemporalDuration implements TemporalAccessor {
+    private static final Temporal BASE = LocalDateTime.of(0, 1, 1, 0, 0, 0, 0);
+
+    private static final DateTimeFormatter DTF = new DateTimeFormatterBuilder().optionalStart()
+            .appendValue(YEAR)
+            .appendLiteral(" years ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(MONTH_OF_YEAR).appendLiteral(" months ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(DAY_OF_MONTH).appendLiteral(" days ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(HOUR_OF_DAY).appendLiteral(" hours ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(MINUTE_OF_HOUR).appendLiteral(" minutes ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(SECOND_OF_MINUTE).appendLiteral(" seconds").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(MILLI_OF_SECOND).appendLiteral(" milliseconds")
+            .optionalEnd()
+            .toFormatter();
+
+    private final Duration duration;
+    private final Temporal temporal;
+
+    TemporalDuration(final Duration duration) {
+        this.duration = duration;
+        this.temporal = duration.addTo(BASE);
+    }
+
+    @Override
+    public boolean isSupported(final TemporalField field) {
+        return temporal.isSupported(field) && temporal.getLong(field) - BASE.getLong(field) != 0L;
+    }
+
+    @Override
+    public long getLong(final TemporalField temporalField) {
+        if (!isSupported(temporalField)) {
+            throw new UnsupportedTemporalTypeException(temporalField.toString());
+        }
+        return temporal.getLong(temporalField) - BASE.getLong(temporalField);
+    }
+
+    @Override
+    public String toString() {
+        if (duration.compareTo(Duration.ofMillis(1)) < 0) {
+            return duration.toNanos() + " nanoseconds";
+        } else {
+            return DTF.format(this).trim();
+        }
+    }
+
+}
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
new file mode 100644
index 000000000..1a3bad814
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
@@ -0,0 +1,181 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+class ConditionListenersPositiveTest {
+
+    @BeforeAll
+    static void setup() {
+        Awaitility.pollInSameThread();
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: listener into condition declaration, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 1 top-level step for 1 await condition</li>
+     * <li>2. Top level step has passed status</li>
+     * <li>3. Top level step has default name</li>
+     */
+    @TestFactory
+    Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await().with()
+                            .conditionEvaluationListener(new AllureAwaitilityListener())
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+
+        return Stream.of(
+                DynamicTest.dynamicTest("Exactly 1 top level step for 1 awaitility condition", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .hasSize(1)
+                ),
+                DynamicTest.dynamicTest("Top level step has passed status", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .allMatch(step -> Status.PASSED.equals(step.getStatus()))
+                ),
+                DynamicTest.dynamicTest("Top level step has default name because await() wo alias", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .extracting(StepResult::getName)
+                                .containsExactly("Awaitility: Starting evaluation")
+                )
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: listener into condition declaration, await with alias
+     * <p>
+     * Test should check that:
+     * <li>1. Top level step has name with alias from await('alias')</li>
+     */
+    @Test
+    void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await("Counter should be at least 3").with()
+                            .conditionEvaluationListener(new AllureAwaitilityListener())
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertEquals(
+                "Awaitility: Counter should be at least 3",
+                testResult.get(0).getSteps().get(0).getName(),
+                "Top level step has name with alias"
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: listener into condition declaration, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 4 second-level steps for condition with 4 polls iteration</li>
+     * <li>2. All second-level steps should have passed status for successful condition evaluation</li>
+     * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
+     */
+    @TestFactory
+    Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await().with()
+                            .conditionEvaluationListener(new AllureAwaitilityListener())
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+
+        return Stream.of(
+                dynamicTest("Exactly 4 second level steps for 4 polling iterations", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                                .hasSize(4)
+                ),
+                dynamicTest("All second level steps has passed statuses", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                                .allMatch(x -> x.getStatus().equals(Status.PASSED))
+                ),
+                dynamicTest("Second level step 1 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                                .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                                .contains("expected <3> but was <0>")
+                                .contains("elapsed time")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                ),
+                dynamicTest("Second level step 2 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                                .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                                .contains("expected <3> but was <1>")
+                                .contains("elapsed time")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                ),
+                dynamicTest("Second level step 3 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
+                                .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                                .contains("expected <3> but was <2>")
+                                .contains("elapsed time")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                ),
+                dynamicTest("Second level step 4 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
+                                .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                                .contains("reached its end value of <3> after")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                )
+        );
+    }
+
+}
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
new file mode 100644
index 000000000..5c169fd63
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
@@ -0,0 +1,127 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestInstance;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+class GlobalSettingsNegativeTest {
+
+    @AfterEach
+    void reset() {
+        Awaitility.reset();
+    }
+
+    @BeforeEach
+    void setup() {
+        Awaitility.pollInSameThread();
+        Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+    }
+
+    /**
+     * Negative test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Top level step has broken status</li>
+     */
+    @Test
+    void globalSettingsAwaitWoAliasCheckTopLevelBrokenStep() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await().with()
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertEquals(
+                Status.FAILED, testResult.get(0).getSteps().get(0).getStatus(),
+                "Top level step has broken status"
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 2 second-level steps for condition with 2 polls iteration</li>
+     * <li>2. All second-level steps should have passed or broken status for successful and timeout evaluations</li>
+     * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
+     */
+    @TestFactory
+    Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelTimeoutStep() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await().with()
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+
+        return Stream.of(
+                dynamicTest("Second level steps count", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                                .as("Exactly 2 second level steps for 2 polling iterations")
+                                .hasSize(2)),
+                dynamicTest("Second level step 1 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsNegativeTest")
+                                .contains("expected <3> but was <0>")
+                                .contains("elapsed time")
+                                .contains("remaining time")
+                                .contains("last poll interval was")),
+                dynamicTest("Second level step 1 status", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getStatus())
+                                .isEqualTo(Status.PASSED)),
+                dynamicTest("Second level step 2 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                                .contains("Condition timeout.")
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsNegativeTest")),
+                dynamicTest("Second level step 2 status", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getStatus())
+                                .isEqualTo(Status.BROKEN))
+        );
+    }
+
+}
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
new file mode 100644
index 000000000..52a6b50db
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
@@ -0,0 +1,199 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+class GlobalSettingsPositiveTest {
+
+    @AfterEach
+    void reset() {
+        Awaitility.reset();
+    }
+
+    @BeforeEach
+    void setup() {
+        Awaitility.pollInSameThread();
+        Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 1 top-level step for 1 await condition</li>
+     * <li>2. Top level step has passed status</li>
+     * <li>3. Top level step has default name</li>
+     */
+    @Test
+    Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await().with()
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+
+        return Stream.of(
+                dynamicTest("Steps count", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .as("Exactly 1 top level step for 1 awaitility condition")
+                                .hasSize(1)
+                ),
+                dynamicTest("Top level step status", () ->
+                        assertEquals(
+                                Status.PASSED, testResult.get(0).getSteps().get(0).getStatus(),
+                                "Top level step has passed status"
+                        )
+                ),
+                dynamicTest("Top level step name", () ->
+                        assertEquals(
+                                "Awaitility: Starting evaluation",
+                                testResult.get(0).getSteps().get(0).getName(),
+                                "Top level step has default name because await() wo alias"
+                        )
+                )
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await with alias
+     * <p>
+     * Test should check that:
+     * <li>1. Top level step has name with alias from await('alias')</li>
+     */
+    @Test
+    void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await("Counter should be at least 3").with()
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertEquals(
+                "Awaitility: Counter should be at least 3",
+                testResult.get(0).getSteps().get(0).getName(),
+                "Top level step has name with alias"
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 4 second-level steps for condition with 4 polls iteration</li>
+     * <li>2. All second-level steps should have passed status for successful condition evaluation</li>
+     * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
+     */
+    @Test
+    Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    final AtomicInteger atomicInteger = new AtomicInteger(0);
+                    await().with()
+                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                            .until(atomicInteger::getAndIncrement, is(3));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+
+        return Stream.of(
+                dynamicTest("Second level steps count", () ->
+                        assertEquals(
+                                4, testResult.get(0).getSteps().get(0).getSteps().size(),
+                                "Exactly 4 second level steps for 4 polling iterations"
+                        )
+                ),
+                dynamicTest("Second level steps all passed", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                                .extracting(StepResult::getStatus)
+                                .containsExactlyInAnyOrder(
+                                        Status.PASSED,
+                                        Status.PASSED,
+                                        Status.PASSED,
+                                        Status.PASSED
+                                )
+                ),
+                dynamicTest("Second level step 1 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                                .contains("expected <3> but was <0>")
+                                .contains("elapsed time")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                ),
+                dynamicTest("Second level step 2 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                                .contains("expected <3> but was <1>")
+                                .contains("elapsed time")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                ),
+                dynamicTest("Second level step 3 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                                .contains("expected <3> but was <2>")
+                                .contains("elapsed time")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                ),
+                dynamicTest("Second level step 4 name", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                                .contains("java.util.concurrent.atomic.AtomicInteger:")
+                                .contains("reached its end value of <3> after")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                )
+        );
+    }
+
+}
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
new file mode 100644
index 000000000..36a74a164
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
@@ -0,0 +1,70 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.*;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class MultipleConditionsTest {
+
+    @AfterEach
+    void reset() {
+        Awaitility.reset();
+    }
+
+    @BeforeEach
+    void setup() {
+        Awaitility.pollInSameThread();
+        Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+    }
+
+    @TestFactory
+    Stream<DynamicNode> bothAwaitilityStepsShouldAppearTest() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    await().with()
+                            .alias("First waiting")
+                            .until(() -> true);
+                    await().with()
+                            .alias("Second waiting")
+                            .until(() -> true);
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+
+        return Stream.of(
+                DynamicTest.dynamicTest("Exactly 2 top level step for 2 awaitility condition", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .describedAs("Allure TestResult contains exactly 2 top level step for 2 awaitility condition")
+                                .hasSize(2)
+                ),
+                DynamicTest.dynamicTest("All top level step for all awaitility condition has PASSED", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .describedAs("Allure TestResult contains all top level step for all awaitility with PASSED condition")
+                                .allMatch(step -> Status.PASSED.equals(step.getStatus()))
+                )
+        );
+    }
+
+}
diff --git a/allure-bom/build.gradle.kts b/allure-bom/build.gradle.kts
new file mode 100644
index 000000000..9593300aa
--- /dev/null
+++ b/allure-bom/build.gradle.kts
@@ -0,0 +1,33 @@
+plugins {
+    `java-platform`
+}
+
+description = "Allure Java (Bill of Materials)"
+
+dependencies {
+    constraints {
+        rootProject.subprojects.sorted()
+                .forEach { api("${it.group}:${it.name}:${it.version}") }
+    }
+}
+
+tasks.withType(Jar::class) {
+    enabled = false
+}
+
+configurations.archives {
+    artifacts.removeAll{ it.extension == "jar" }
+}
+
+publishing.publications.named<MavenPublication>("maven") {
+    pom {
+        from(components["javaPlatform"])
+        description.set("This Bill of Materials POM can be used to ease dependency management " +
+                "when referencing multiple Allure artifacts using Gradle or Maven.")
+        packaging = "pom"
+        withXml {
+            val filteredContent = asString().replace("\\s*<scope>compile</scope>".toRegex(), "")
+            asString().clear().append(filteredContent)
+        }
+    }
+}
diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts
index bd740f9a7..dbad67a9c 100644
--- a/allure-citrus/build.gradle.kts
+++ b/allure-citrus/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure Citrus Integration"
 
-val agent: Configuration by configurations.creating
-
 val citrusVersion = "2.8.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("com.consol.citrus:citrus-core:$citrusVersion")
     testImplementation("com.consol.citrus:citrus-http:$citrusVersion")
@@ -32,7 +29,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
index 3db26c236..21f68bebe 100644
--- a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
+++ b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
index a31fd6f00..7f29c0490 100644
--- a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
+++ b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java
deleted file mode 100644
index 311802432..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumberjvm;
-
-import cucumber.runtime.StepDefinitionMatch;
-import gherkin.I18n;
-import gherkin.formatter.Formatter;
-import gherkin.formatter.Reporter;
-import gherkin.formatter.model.Background;
-import gherkin.formatter.model.DataTableRow;
-import gherkin.formatter.model.Examples;
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Match;
-import gherkin.formatter.model.Result;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.ScenarioOutline;
-import gherkin.formatter.model.Step;
-import gherkin.formatter.model.Tag;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.util.ResultsUtils;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Allure plugin for Cucumber-JVM.
- */
-@SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity",
-        "ClassDataAbstractionCoupling",
-        "unused"
-})
-public class AllureCucumberJvm implements Reporter, Formatter {
-
-    private static final List<String> SCENARIO_OUTLINE_KEYWORDS = Collections.synchronizedList(new ArrayList<String>());
-
-    private static final String FAILED = "failed";
-    private static final String PASSED = "passed";
-    private static final String SKIPPED = "skipped";
-    private static final String PENDING = "pending";
-
-    private static final String TXT_EXTENSION = ".txt";
-    private static final String TEXT_PLAIN = "text/plain";
-
-    private final Map<Scenario, String> scenarioUuids = new ConcurrentHashMap<>();
-    private final Deque<Step> gherkinSteps = new LinkedList<>();
-    private final AllureLifecycle lifecycle;
-    private Feature currentFeature;
-    private boolean isNullMatch = true;
-    private Scenario currentScenario;
-
-
-    @SuppressWarnings("unused")
-    public AllureCucumberJvm() {
-        this(Allure.getLifecycle());
-    }
-
-    public AllureCucumberJvm(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-        final List<I18n> i18nList = I18n.getAll();
-        i18nList.forEach(i18n -> SCENARIO_OUTLINE_KEYWORDS.addAll(i18n.keywords("scenario_outline")));
-    }
-
-    @Override
-    public void feature(final Feature feature) {
-        this.currentFeature = feature;
-    }
-
-    @Override
-    public void before(final Match match, final Result result) {
-        new StepUtils(currentFeature, currentScenario).fireFixtureStep(match, result, true);
-    }
-
-    @Override
-    public void after(final Match match, final Result result) {
-        new StepUtils(currentFeature, currentScenario).fireFixtureStep(match, result, false);
-    }
-
-    @Override
-    public void startOfScenarioLifeCycle(final Scenario scenario) {
-        this.currentScenario = scenario;
-
-        final Deque<Tag> tags = new LinkedList<>(scenario.getTags());
-
-        if (SCENARIO_OUTLINE_KEYWORDS.contains(scenario.getKeyword())) {
-            synchronized (gherkinSteps) {
-                gherkinSteps.clear();
-            }
-        } else {
-            tags.addAll(currentFeature.getTags());
-        }
-
-        final LabelBuilder labelBuilder = new LabelBuilder(currentFeature, scenario, tags);
-
-        final String uuid = UUID.randomUUID().toString();
-        scenarioUuids.put(scenario, uuid);
-
-        final TestResult result = new TestResult()
-                .setUuid(uuid)
-                .setHistoryId(StepUtils.getHistoryId(scenario.getId()))
-                .setFullName(String.format("%s: %s", currentFeature.getName(), scenario.getName()))
-                .setName(scenario.getName())
-                .setLabels(labelBuilder.getScenarioLabels())
-                .setLinks(labelBuilder.getScenarioLinks());
-
-        if (!currentFeature.getDescription().isEmpty()) {
-            result.setDescription(currentFeature.getDescription());
-        }
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestCase(uuid);
-
-    }
-
-    @Override
-    public void step(final Step step) {
-        synchronized (gherkinSteps) {
-            gherkinSteps.add(step);
-        }
-    }
-
-    @Override
-    public void match(final Match match) {
-        final StepUtils stepUtils = new StepUtils(currentFeature, currentScenario);
-        if (match instanceof StepDefinitionMatch) {
-            isNullMatch = false;
-            final Step step = stepUtils.extractStep((StepDefinitionMatch) match);
-            synchronized (gherkinSteps) {
-                while (gherkinSteps.peek() != null && !stepUtils.isEqualSteps(step, gherkinSteps.peek())) {
-                    stepUtils.fireCanceledStep(gherkinSteps.remove());
-                }
-                if (stepUtils.isEqualSteps(step, gherkinSteps.peek())) {
-                    gherkinSteps.remove();
-                }
-            }
-            final StepResult stepResult = new StepResult();
-            stepResult.setName(String.format("%s %s", step.getKeyword(), getStepName(step)))
-                    .setStart(System.currentTimeMillis());
-
-            final String scenarioUuid = scenarioUuids.get(currentScenario);
-            lifecycle.startStep(scenarioUuid, stepUtils.getStepUuid(step), stepResult);
-            createDataTableAttachment(step.getRows());
-        }
-    }
-
-    @SuppressWarnings("PMD.NcssCount")
-    @Override
-    public void result(final Result result) {
-        if (!isNullMatch) {
-            final StatusDetails statusDetails =
-                    ResultsUtils.getStatusDetails(result.getError()).orElse(new StatusDetails());
-            final TagParser tagParser = new TagParser(currentFeature, currentScenario);
-            statusDetails
-                    .setFlaky(tagParser.isFlaky())
-                    .setMuted(tagParser.isMuted())
-                    .setKnown(tagParser.isKnown());
-
-            final String scenarioUuid = scenarioUuids.get(currentScenario);
-            switch (result.getStatus()) {
-                case FAILED:
-                    final Status status = ResultsUtils.getStatus(result.getError())
-                            .orElse(Status.FAILED);
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.FAILED));
-                    lifecycle.updateTestCase(scenarioUuid, scenarioResult ->
-                            scenarioResult.setStatus(status)
-                                    .setStatusDetails(statusDetails));
-                    lifecycle.stopStep();
-                    break;
-                case PENDING:
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.SKIPPED));
-                    lifecycle.updateTestCase(scenarioUuid, scenarioResult ->
-                            scenarioResult.setStatus(Status.SKIPPED)
-                                    .setStatusDetails(statusDetails));
-                    lifecycle.stopStep();
-                    break;
-                case SKIPPED:
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.SKIPPED));
-                    lifecycle.stopStep();
-                    break;
-                case PASSED:
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.PASSED));
-                    lifecycle.stopStep();
-                    lifecycle.updateTestCase(scenarioUuid, scenarioResult ->
-                            scenarioResult.setStatus(Status.PASSED)
-                                    .setStatusDetails(statusDetails));
-                    break;
-                default:
-                    break;
-            }
-            isNullMatch = true;
-        }
-    }
-
-    @Override
-    public void endOfScenarioLifeCycle(final Scenario scenario) {
-        final StepUtils stepUtils = new StepUtils(currentFeature, currentScenario);
-        synchronized (gherkinSteps) {
-            while (gherkinSteps.peek() != null) {
-                stepUtils.fireCanceledStep(gherkinSteps.remove());
-            }
-        }
-        final String scenarioUuid = scenarioUuids.remove(scenario);
-        lifecycle.stopTestCase(scenarioUuid);
-        lifecycle.writeTestCase(scenarioUuid);
-    }
-
-    public String getStepName(final Step step) {
-        return step.getName();
-    }
-
-    private void createDataTableAttachment(final List<DataTableRow> dataTableRows) {
-        final StringBuilder dataTableCsv = new StringBuilder();
-
-        if (dataTableRows != null && !dataTableRows.isEmpty()) {
-            dataTableRows.forEach(dataTableRow -> {
-                dataTableCsv.append(String.join("\t", dataTableRow.getCells()));
-                dataTableCsv.append('\n');
-            });
-
-            final String attachmentSource = lifecycle
-                    .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-            lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
-        }
-    }
-
-    @Override
-    public void embedding(final String string, final byte[] bytes) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(bytes));
-    }
-
-    @Override
-    public void write(final String string) {
-        lifecycle.addAttachment(
-                "Text output",
-                TEXT_PLAIN,
-                TXT_EXTENSION,
-                Objects.toString(string).getBytes(StandardCharsets.UTF_8)
-        );
-    }
-
-    @Override
-    public void syntaxError(final String state, final String event,
-                            final List<String> legalEvents, final String uri, final Integer line) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void uri(final String uri) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void scenarioOutline(final ScenarioOutline so) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void examples(final Examples exmpls) {
-        //Nothing to do with Allure
-    }
-
-
-    @Override
-    public void background(final Background b) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void scenario(final Scenario scnr) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void done() {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void close() {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void eof() {
-        //Nothing to do with Allure
-
-    }
-
-}
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
deleted file mode 100644
index 8acfe213d..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumberjvm;
-
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.Tag;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.util.ResultsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-
-import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
-import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
-import static io.qameta.allure.util.ResultsUtils.createHostLabel;
-import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
-import static io.qameta.allure.util.ResultsUtils.createPackageLabel;
-import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
-import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
-import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
-import static io.qameta.allure.util.ResultsUtils.createTagLabel;
-import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
-import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
-
-/**
- * Scenario labels and links builder.
- */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount"})
-class LabelBuilder {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
-    private static final String COMPOSITE_TAG_DELIMITER = "=";
-
-    private static final String SEVERITY = "@SEVERITY";
-    private static final String ISSUE_LINK = "@ISSUE";
-    private static final String TMS_LINK = "@TMSLINK";
-    private static final String PLAIN_LINK = "@LINK";
-
-    private final List<Label> scenarioLabels = new ArrayList<>();
-    private final List<Link> scenarioLinks = new ArrayList<>();
-
-    LabelBuilder(final Feature feature, final Scenario scenario, final Deque<Tag> tags) {
-        final TagParser tagParser = new TagParser(feature, scenario);
-
-        getScenarioLabels().add(createFeatureLabel(feature.getName()));
-        getScenarioLabels().add(createStoryLabel(scenario.getName()));
-
-        while (tags.peek() != null) {
-            final Tag tag = tags.remove();
-
-            final String tagString = tag.getName();
-
-            if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
-
-                final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
-                if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
-                    // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
-                    continue;
-                }
-
-                final String tagKey = tagParts[0].toUpperCase();
-                final String tagValue = tagParts[1];
-
-                // Handle composite named links
-                if (tagKey.startsWith(PLAIN_LINK + ".")) {
-                    tryHandleNamedLink(tagString);
-                    continue;
-                }
-
-                switch (tagKey) {
-                    case SEVERITY:
-                        getScenarioLabels().add(createSeverityLabel(tagValue.toLowerCase()));
-                        break;
-                    case TMS_LINK:
-                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
-                        break;
-                    case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
-                        break;
-                    case PLAIN_LINK:
-                        getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
-                        break;
-                    default:
-                        LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
-                        break;
-                }
-            } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(createSeverityLabel(tagString.substring(1)));
-            } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
-            }
-        }
-
-        getScenarioLabels().addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createPackageLabel(feature.getName()),
-                createSuiteLabel(feature.getName()),
-                createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumberjvm"),
-                createLanguageLabel("java")
-        ));
-
-    }
-
-    public List<Label> getScenarioLabels() {
-        return scenarioLabels;
-    }
-
-    public List<Link> getScenarioLinks() {
-        return scenarioLinks;
-    }
-
-    private Label getTagLabel(final Tag tag) {
-        return createTagLabel(tag.getName().substring(1));
-    }
-
-    /**
-     * Handle composite named links.
-     *
-     * @param tagString Full tag name and value
-     */
-    private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
-        final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
-
-        if (namedLinkPattern.matcher(tagString).matches()) {
-            final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
-            final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(ResultsUtils.createLink(null, name, null, type));
-        } else {
-            LOGGER.warn("Composite named tag {} is not matches regex {}. skipping", tagString,
-                    namedLinkPatternString);
-        }
-    }
-
-}
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java
deleted file mode 100644
index 99c262b38..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumberjvm;
-
-import cucumber.runtime.CucumberException;
-import cucumber.runtime.StepDefinitionMatch;
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Match;
-import gherkin.formatter.model.Result;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.Step;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.util.ResultsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.util.Objects;
-
-import static io.qameta.allure.util.ResultsUtils.md5;
-
-/**
- * Step utils.
- */
-class StepUtils {
-    private static final Logger LOG = LoggerFactory.getLogger(StepUtils.class);
-    private static final String FAILED = "failed";
-
-    private final AllureLifecycle lifecycle;
-    private final Feature feature;
-    private final Scenario scenario;
-
-    StepUtils(final Feature feature, final Scenario scenario) {
-        this.lifecycle = Allure.getLifecycle();
-        this.feature = feature;
-        this.scenario = scenario;
-    }
-
-    protected Step extractStep(final StepDefinitionMatch match) {
-        try {
-            final Field step = match.getClass().getDeclaredField("step");
-            step.setAccessible(true);
-            return (Step) step.get(match);
-        } catch (ReflectiveOperationException e) {
-            //shouldn't ever happen
-            LOG.error(e.getMessage(), e);
-            throw new CucumberException(e);
-        }
-    }
-
-    protected boolean isEqualSteps(final Step step, final Step gherkinStep) {
-        return Objects.equals(step.getLine(), gherkinStep.getLine());
-    }
-
-    protected void fireCanceledStep(final Step unimplementedStep) {
-        final StepResult stepResult = new StepResult();
-        stepResult.setName(unimplementedStep.getName())
-                .setStart(System.currentTimeMillis())
-                .setStop(System.currentTimeMillis())
-                .setStatus(Status.SKIPPED)
-                .setStatusDetails(new StatusDetails().setMessage("Unimplemented step"));
-        lifecycle.startStep(scenario.getId(), getStepUuid(unimplementedStep), stepResult);
-        lifecycle.stopStep(getStepUuid(unimplementedStep));
-
-        final StatusDetails statusDetails = new StatusDetails();
-        final TagParser tagParser = new TagParser(feature, scenario);
-        statusDetails
-                .setFlaky(tagParser.isFlaky())
-                .setMuted(tagParser.isMuted())
-                .setKnown(tagParser.isKnown());
-        lifecycle.updateTestCase(scenario.getId(), scenarioResult ->
-                scenarioResult.setStatus(Status.SKIPPED)
-                        .setStatusDetails(statusDetails
-                                .setMessage("Unimplemented steps were found")));
-    }
-
-    protected String getStepUuid(final Step step) {
-        return feature.getId() + scenario.getId() + step.getName() + step.getLine();
-    }
-
-    protected static String getHistoryId(final String id) {
-        return md5(id);
-    }
-
-    protected void fireFixtureStep(final Match match, final Result result, final boolean isBefore) {
-        final String uuid = md5(match.getLocation());
-        final StepResult stepResult = new StepResult()
-                .setName(match.getLocation())
-                .setStatus(Status.fromValue(result.getStatus()))
-                .setStart(System.currentTimeMillis() - result.getDuration())
-                .setStop(System.currentTimeMillis());
-        if (FAILED.equals(result.getStatus())) {
-            final StatusDetails statusDetails = ResultsUtils.getStatusDetails(result.getError()).get();
-            stepResult.setStatusDetails(statusDetails);
-            if (isBefore) {
-                final TagParser tagParser = new TagParser(feature, scenario);
-                statusDetails
-                        .setMessage("Before is failed: " + result.getError().getLocalizedMessage())
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                lifecycle.updateTestCase(scenario.getId(), scenarioResult ->
-                        scenarioResult.setStatus(Status.SKIPPED)
-                                .setStatusDetails(statusDetails));
-            }
-        }
-        lifecycle.startStep(scenario.getId(), uuid, stepResult);
-        lifecycle.stopStep(uuid);
-    }
-}
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/TagParser.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/TagParser.java
deleted file mode 100644
index 670aad996..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/TagParser.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumberjvm;
-
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.Tag;
-import io.qameta.allure.SeverityLevel;
-
-import java.util.Arrays;
-
-/**
- * Parser for tags.
- */
-class TagParser {
-    private static final String FLAKY = "@FLAKY";
-    private static final String KNOWN = "@KNOWN";
-    private static final String MUTED = "@MUTED";
-
-    private final Feature feature;
-    private final Scenario scenario;
-
-    TagParser(final Feature feature, final Scenario scenario) {
-        this.feature = feature;
-        this.scenario = scenario;
-    }
-
-    protected boolean isFlaky() {
-        return getStatusDetailByTag(FLAKY);
-    }
-
-    protected boolean isMuted() {
-        return getStatusDetailByTag(MUTED);
-    }
-
-    protected boolean isKnown() {
-        return getStatusDetailByTag(KNOWN);
-    }
-
-    protected boolean getStatusDetailByTag(final String tagName) {
-        return scenario.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
-    }
-
-    protected boolean isResultTag(final Tag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
-                .contains(tag.getName().toUpperCase());
-    }
-
-    protected boolean isPureSeverityTag(final Tag tag) {
-        return Arrays.stream(SeverityLevel.values())
-                .map(SeverityLevel::value)
-                .map(value -> "@" + value)
-                .anyMatch(value -> value.equalsIgnoreCase(tag.getName()));
-    }
-
-}
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
deleted file mode 100644
index 5b63d63ba..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumberjvm;
-
-import cucumber.api.testng.FeatureResultListener;
-import cucumber.runtime.ClassFinder;
-import cucumber.runtime.Runtime;
-import cucumber.runtime.RuntimeOptions;
-import cucumber.runtime.io.MultiLoader;
-import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.io.ResourceLoaderClassFinder;
-import cucumber.runtime.model.CucumberFeature;
-import io.github.glytching.junit.extension.system.SystemProperty;
-import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.Issue;
-import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Stage;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.lang.Thread.currentThread;
-import static java.util.Objects.nonNull;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("unchecked")
-class AllureCucumberJvmTest {
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSetName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName)
-                .containsExactlyInAnyOrder("Add a to b");
-
-    }
-
-    @AllureFeatures.PassedTests
-    @Test
-    void shouldSetStatus() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetFailedStatus() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetStatusDetails() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatusDetails)
-                .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected: <15> but was: <123>");
-    }
-
-    @AllureFeatures.BrokenTests
-    @Test
-    void shouldSetBrokenStatus() {
-        final AllureResults results = runFeature("features/broken.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Stages
-    @Test
-    void shouldSetStage() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStage)
-                .containsExactlyInAnyOrder(Stage.FINISHED);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStart() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStart)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStop() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStop)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.FullName
-    @Test
-    void shouldSetFullName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
-    }
-
-    @AllureFeatures.Descriptions
-    @Test
-    void shouldSetDescription() {
-        final AllureResults results = runFeature("features/description.feature");
-
-        final String expected = "\nThis is description for current feature.\n"
-                + "It should appear on each scenario in report";
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getDescription)
-                .containsExactlyInAnyOrder(
-                        expected,
-                        expected
-                );
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddDataTableAttachment() {
-        final AllureResults results = runFeature("features/datatable.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Data table", "text/tab-separated-values")
-                );
-
-        final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = results.getAttachments();
-        assertThat(attachmentFiles)
-                .containsKeys(dataTableAttachment.getSource());
-
-        final byte[] bytes = attachmentFiles.get(dataTableAttachment.getSource());
-        final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
-
-        assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
-                );
-
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddAttachments() {
-        final AllureResults results = runFeature("features/attachments.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
-                );
-
-        final List<String> attachmentContents = results.getAttachments().values().stream()
-                .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
-                .collect(Collectors.toList());
-
-        assertThat(attachmentContents)
-                .containsExactlyInAnyOrder("text attachment", "image attachment");
-    }
-
-    @AllureFeatures.Steps
-    @Disabled("unsupported")
-    @Test
-    void shouldAddBackgroundSteps() {
-        final AllureResults results = runFeature("features/background.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(1)
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Disabled("unsupported")
-    @Test
-    void shouldAddParametersFromExamples() {
-        final AllureResults results = runFeature("features/examples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddTags() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("tag", "FeatureTag"),
-                        tuple("tag", "good")
-                );
-    }
-
-    @AllureFeatures.Links
-    @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @Test
-    void shouldAddLinks() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLinks)
-                .extracting(Link::getName, Link::getType, Link::getUrl)
-                .contains(
-                        tuple("OAT-4444", "tms", "https://example.org/tms/OAT-4444"),
-                        tuple("BUG-22400", "issue", "https://example.org/issue/BUG-22400")
-                );
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddBddLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("feature", "Test Simple Scenarios"),
-                        tuple("story", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.Timeline
-    @Test
-    void shouldThreadHostLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName)
-                .contains("host", "thread");
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldCommonLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("package", "Test Simple Scenarios"),
-                        tuple("suite", "Test Simple Scenarios"),
-                        tuple("testClass", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldProcessNotImplementedScenario() {
-        final AllureResults results = runFeature("features/undefined.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder((Status) null);
-    }
-
-    @AllureFeatures.Base
-    @Disabled("unsupported")
-    @Test
-    void shouldSupportDryRun() {
-        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Add a to b", Status.SKIPPED)
-                );
-    }
-
-    @AllureFeatures.Base
-    @Issue("173")
-    @Issue("164")
-    @Test
-    void shouldUseUuid() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getUuid)
-                .allMatch(uuid -> nonNull(uuid) && uuid.matches("[\\-a-z0-9]+"), "UUID");
-    }
-
-    private AllureResults runFeature(final String featureResource,
-                                     final String... moreOptions) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumberJvm cucumberJvm = new AllureCucumberJvm(lifecycle);
-        final ClassLoader classLoader = currentThread().getContextClassLoader();
-        final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-        final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumberjvm.samples",
-                "--plugin", "null",
-                "src/test/resources/" + featureResource
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new RuntimeOptions(opts);
-        final Runtime runtime = new Runtime(resourceLoader, classFinder, classLoader, options);
-
-        options.addPlugin(cucumberJvm);
-
-        final FeatureResultListener resultListener = new FeatureResultListener(
-                options.reporter(classLoader),
-                options.isStrict()
-        );
-        final List<CucumberFeature> features = options.cucumberFeatures(resourceLoader);
-        features.forEach(cucumberFeature -> cucumberFeature.run(
-                options.formatter(classLoader),
-                resultListener,
-                runtime)
-        );
-        return writer;
-    }
-}
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/AttachmentSteps.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/AttachmentSteps.java
deleted file mode 100644
index b6d92c5b5..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/AttachmentSteps.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumberjvm.samples;
-
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-
-public class AttachmentSteps
-{
-    private Scenario scenario;
-
-    @Before("@attachments")
-    public void setup(Scenario scenario)
-    {
-        this.scenario = scenario;
-    }
-
-    @Given("step with scenario write")
-    public void stepWithScenarioWrite()
-    {
-        scenario.write("text attachment");
-    }
-
-    @Given("step with scenario embed")
-    public void stepWithScenarioEmbed()
-    {
-        scenario.embed("image attachment".getBytes(), "image/png");
-    }
-}
diff --git a/allure-cucumber-jvm/src/test/resources/features/undefined.feature b/allure-cucumber-jvm/src/test/resources/features/undefined.feature
deleted file mode 100644
index caa0b507b..000000000
--- a/allure-cucumber-jvm/src/test/resources/features/undefined.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Step is not implemented
-    Given hello my friend
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java
deleted file mode 100644
index 0dd1a38bf..000000000
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.api.HookType;
-import cucumber.api.PendingException;
-import cucumber.api.Result;
-import cucumber.api.TestCase;
-import cucumber.api.TestStep;
-import cucumber.api.event.EmbedEvent;
-import cucumber.api.event.EventHandler;
-import cucumber.api.event.EventPublisher;
-import cucumber.api.event.TestCaseFinished;
-import cucumber.api.event.TestCaseStarted;
-import cucumber.api.event.TestSourceRead;
-import cucumber.api.event.TestStepFinished;
-import cucumber.api.event.TestStepStarted;
-import cucumber.api.event.WriteEvent;
-import cucumber.api.formatter.Formatter;
-import cucumber.runner.UnskipableStep;
-import gherkin.ast.Examples;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableCell;
-import gherkin.pickles.PickleCell;
-import gherkin.pickles.PickleRow;
-import gherkin.pickles.PickleTable;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.FixtureResult;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-import static io.qameta.allure.util.ResultsUtils.md5;
-
-/**
- * Allure plugin for Cucumber JVM 2.0.
- */
-@SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
-})
-public class AllureCucumber2Jvm implements Formatter {
-
-    private final AllureLifecycle lifecycle;
-
-    private final Map<String, String> scenarioUuids = new HashMap<>();
-
-    private final CucumberSourceUtils cucumberSourceUtils = new CucumberSourceUtils();
-    private Feature currentFeature;
-    private String currentFeatureFile;
-    private TestCase currentTestCase;
-    private String currentContainer;
-    private boolean forbidTestCaseStatusChange;
-
-    private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
-    private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
-    private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
-    private final EventHandler<TestStepStarted> stepStartedHandler = this::handleTestStepStarted;
-    private final EventHandler<TestStepFinished> stepFinishedHandler = this::handleTestStepFinished;
-    private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
-    private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
-
-    private static final String TXT_EXTENSION = ".txt";
-    private static final String TEXT_PLAIN = "text/plain";
-
-    @SuppressWarnings("unused")
-    public AllureCucumber2Jvm() {
-        this(Allure.getLifecycle());
-    }
-
-    public AllureCucumber2Jvm(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-    }
-
-    @Override
-    public void setEventPublisher(final EventPublisher publisher) {
-        publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
-
-        publisher.registerHandlerFor(TestCaseStarted.class, caseStartedHandler);
-        publisher.registerHandlerFor(TestCaseFinished.class, caseFinishedHandler);
-
-        publisher.registerHandlerFor(TestStepStarted.class, stepStartedHandler);
-        publisher.registerHandlerFor(TestStepFinished.class, stepFinishedHandler);
-
-        publisher.registerHandlerFor(WriteEvent.class, writeEventHandler);
-        publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
-    }
-
-    /*
-    Event Handlers
-     */
-
-    private void handleFeatureStartedHandler(final TestSourceRead event) {
-        cucumberSourceUtils.addTestSourceReadEvent(event.uri, event);
-    }
-
-    private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentTestCase = event.testCase;
-        currentFeatureFile = currentTestCase.getUri();
-        currentFeature = cucumberSourceUtils.getFeature(currentFeatureFile);
-        currentContainer = UUID.randomUUID().toString();
-        forbidTestCaseStatusChange = false;
-
-
-        final Deque<PickleTag> tags = new LinkedList<>(currentTestCase.getTags());
-
-        final LabelBuilder labelBuilder = new LabelBuilder(currentFeature, currentTestCase, tags);
-
-        final String name = currentTestCase.getName();
-        final String featureName = currentFeature.getName();
-
-        final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase))
-                .setHistoryId(getHistoryId(currentTestCase))
-                .setFullName(featureName + ": " + name)
-                .setName(name)
-                .setLabels(labelBuilder.getScenarioLabels())
-                .setLinks(labelBuilder.getScenarioLinks());
-
-        final ScenarioDefinition scenarioDefinition =
-                cucumberSourceUtils.getScenarioDefinition(currentFeatureFile, currentTestCase.getLine());
-        if (scenarioDefinition instanceof ScenarioOutline) {
-            result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition)
-            );
-        }
-
-        if (currentFeature.getDescription() != null && !currentFeature.getDescription().isEmpty()) {
-            result.setDescription(currentFeature.getDescription());
-        }
-
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase));
-    }
-
-    private void handleTestCaseFinished(final TestCaseFinished event) {
-
-        final String uuid = getTestCaseUuid(event.testCase);
-        final Optional<StatusDetails> details = getStatusDetails(event.result.getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
-        lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
-        lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
-    }
-
-    private void handleTestStepStarted(final TestStepStarted event) {
-        if (!event.testStep.isHook()) {
-            final String stepKeyword = Optional.ofNullable(
-                    cucumberSourceUtils.getKeywordFromSource(currentFeatureFile, event.testStep.getStepLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, event.testStep.getPickleStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase), getStepUuid(event.testStep), stepResult);
-
-            event.testStep.getStepArgument().stream()
-                    .filter(PickleTable.class::isInstance)
-                    .findFirst()
-                    .ifPresent(table -> createDataTableAttachment((PickleTable) table));
-        } else if (event.testStep instanceof UnskipableStep) {
-            initHook((UnskipableStep) event.testStep);
-        }
-    }
-
-    private void initHook(final UnskipableStep hook) {
-
-        final FixtureResult hookResult = new FixtureResult()
-                .setName(hook.getCodeLocation())
-                .setStart(System.currentTimeMillis());
-
-        if (hook.getHookType() == HookType.Before) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        }
-
-    }
-
-    private void handleTestStepFinished(final TestStepFinished event) {
-        if (event.testStep.isHook() && event.testStep instanceof UnskipableStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
-        }
-    }
-
-    private void handleWriteEvent(final WriteEvent event) {
-        lifecycle.addAttachment(
-                "Text output",
-                TEXT_PLAIN,
-                TXT_EXTENSION,
-                Objects.toString(event.text).getBytes(StandardCharsets.UTF_8)
-        );
-    }
-
-    private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.data));
-    }
-
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer;
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final TestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getPickleStep().getText() + step.getStepLine();
-    }
-
-    private String getHookStepUuid(final TestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getHookType().toString() + step.getCodeLocation();
-    }
-
-    private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri() + ":" + testCase.getLine();
-        return md5(testCaseLocation);
-    }
-
-    private Status translateTestCaseStatus(final Result testCaseResult) {
-        switch (testCaseResult.getStatus()) {
-            case FAILED:
-                return getStatus(testCaseResult.getError())
-                        .orElse(Status.FAILED);
-            case PASSED:
-                return Status.PASSED;
-            case SKIPPED:
-            case PENDING:
-                return Status.SKIPPED;
-            case AMBIGUOUS:
-            case UNDEFINED:
-            default:
-                return null;
-        }
-    }
-
-    private List<Parameter> getExamplesAsParameters(final ScenarioOutline scenarioOutline) {
-        final int gap = 2;
-        final Optional<Examples> examplesBlock = scenarioOutline.getExamples().stream()
-                .filter(e -> currentTestCase.getLine() >= e.getLocation().getLine() + gap)
-                .filter(e -> currentTestCase.getLine() < e.getLocation().getLine() + e.getTableBody().size() + gap)
-                .findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final Examples examples = examplesBlock.get();
-            final int rowIndex = currentTestCase.getLine() - examples.getLocation().getLine() - gap;
-            final List<TableCell> names = examples.getTableHeader().getCells();
-            final List<TableCell> values = examples.getTableBody().get(rowIndex).getCells();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = names.get(index).getValue();
-                final String value = values.get(index).getValue();
-                return new Parameter().setName(name).setValue(value);
-            }).collect(Collectors.toList());
-        }
-        return Collections.emptyList();
-    }
-
-    private void createDataTableAttachment(final PickleTable pickleTable) {
-        final List<PickleRow> rows = pickleTable.getRows();
-
-        final StringBuilder dataTableCsv = new StringBuilder();
-        if (!rows.isEmpty()) {
-            rows.forEach(dataTableRow -> {
-                dataTableCsv.append(
-                        dataTableRow.getCells().stream()
-                                .map(PickleCell::getValue)
-                                .collect(Collectors.joining("\t"))
-                );
-                dataTableCsv.append('\n');
-            });
-
-            final String attachmentSource = lifecycle
-                    .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-            lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
-        }
-    }
-
-    private void handleHookStep(final TestStepFinished event) {
-        final String uuid = getHookStepUuid(event.testStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.result));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.result));
-            final StatusDetails statusDetails = getStatusDetails(event.result.getError()).get();
-
-            statusDetails.setMessage(event.testStep.getHookType()
-                    .name() + " is failed: " + event.result.getError().getLocalizedMessage());
-
-            if (event.testStep.getHookType() == HookType.Before) {
-                final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange = true;
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
-        }
-
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
-        lifecycle.stopFixture(uuid);
-    }
-
-    private void handlePickleStep(final TestStepFinished event) {
-
-        final Status stepStatus = translateTestCaseStatus(event.result);
-        final StatusDetails statusDetails;
-        if (event.result.getStatus() == Result.Type.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
-
-            statusDetails =
-                    getStatusDetails(new PendingException("TODO: implement me"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.result.getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
-
-
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange = true;
-        }
-
-        final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-        statusDetails
-                .setFlaky(tagParser.isFlaky())
-                .setMuted(tagParser.isMuted())
-                .setKnown(tagParser.isKnown());
-
-        lifecycle.updateStep(getStepUuid(event.testStep),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid(event.testStep));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase),
-                    result -> result.setStatus(status));
-        }
-    }
-}
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/CucumberSourceUtils.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/CucumberSourceUtils.java
deleted file mode 100644
index 519db53f6..000000000
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/CucumberSourceUtils.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.api.event.TestSourceRead;
-
-import gherkin.Parser;
-import gherkin.AstBuilder;
-import gherkin.TokenMatcher;
-import gherkin.ParserException;
-import gherkin.GherkinDialect;
-import gherkin.GherkinDialectProvider;
-
-import gherkin.ast.GherkinDocument;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.Node;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableRow;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-/**
- * Parts of package-private cucumber.runtime.formatter.TestSourcesModel needed for Allure 2 adapter.
- */
-public final class CucumberSourceUtils {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CucumberSourceUtils.class);
-
-    private final Map<String, TestSourceRead> pathToReadEventMap = new HashMap<>();
-    private final Map<String, GherkinDocument> pathToAstMap = new HashMap<>();
-    private final Map<String, Map<Integer, AstNode>> pathToNodeMap = new HashMap<>();
-
-    public void addTestSourceReadEvent(final String path, final TestSourceRead event) {
-        pathToReadEventMap.put(path, event);
-    }
-
-    public Feature getFeature(final String path) {
-        if (!pathToAstMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToAstMap.containsKey(path)) {
-            return pathToAstMap.get(path).getFeature();
-        }
-        return null;
-    }
-
-    private void parseGherkinSource(final String path) {
-        if (!pathToReadEventMap.containsKey(path)) {
-            return;
-        }
-        final Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        final TokenMatcher matcher = new TokenMatcher();
-        try {
-            final GherkinDocument gherkinDocument = parser.parse(pathToReadEventMap.get(path).source, matcher);
-            pathToAstMap.put(path, gherkinDocument);
-            final Map<Integer, AstNode> nodeMap = new HashMap<>();
-            final AstNode currentParent = new AstNode(gherkinDocument.getFeature(), null);
-            for (ScenarioDefinition child : gherkinDocument.getFeature().getChildren()) {
-                processScenarioDefinition(nodeMap, child, currentParent);
-            }
-            pathToNodeMap.put(path, nodeMap);
-        } catch (ParserException e) {
-            LOGGER.trace(e.getMessage(), e);
-        }
-    }
-
-    private void processScenarioDefinition(
-            final Map<Integer, AstNode> nodeMap, final ScenarioDefinition child, final AstNode currentParent
-    ) {
-        final AstNode childNode = new AstNode(child, currentParent);
-        nodeMap.put(child.getLocation().getLine(), childNode);
-
-        child.getSteps().forEach(
-            step -> nodeMap.put(step.getLocation().getLine(), new AstNode(step, childNode))
-        );
-
-        if (child instanceof ScenarioOutline) {
-            processScenarioOutlineExamples(nodeMap, (ScenarioOutline) child, childNode);
-        }
-    }
-
-    private void processScenarioOutlineExamples(
-            final Map<Integer, AstNode> nodeMap, final ScenarioOutline scenarioOutline, final AstNode childNode
-    ) {
-        scenarioOutline.getExamples().forEach(examples -> {
-            final AstNode examplesNode = new AstNode(examples, childNode);
-            final TableRow headerRow = examples.getTableHeader();
-            final AstNode headerNode = new AstNode(headerRow, examplesNode);
-            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
-            IntStream.range(0, examples.getTableBody().size()).forEach(i -> {
-                final TableRow examplesRow = examples.getTableBody().get(i);
-                final Node rowNode = new CucumberSourceUtils.ExamplesRowWrapperNode(examplesRow, i);
-                final AstNode expandedScenarioNode = new AstNode(rowNode, examplesNode);
-                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
-            });
-        });
-    }
-
-    private AstNode getAstNode(final String path, final int line) {
-        if (!pathToNodeMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToNodeMap.containsKey(path)) {
-            return pathToNodeMap.get(path).get(line);
-        }
-        return null;
-    }
-
-    public ScenarioDefinition getScenarioDefinition(final String path, final int line) {
-        return getScenarioDefinition(getAstNode(path, line));
-    }
-
-    private ScenarioDefinition getScenarioDefinition(final AstNode astNode) {
-        return astNode.getNode() instanceof ScenarioDefinition
-                ? (ScenarioDefinition) astNode.getNode()
-                : (ScenarioDefinition) astNode.getParent().getParent().getNode();
-    }
-
-    public String getKeywordFromSource(final String uri, final int stepLine) {
-        final Feature feature = getFeature(uri);
-        if (feature != null) {
-            final TestSourceRead event = getTestSourceReadEvent(uri);
-            final String trimmedSourceLine = event.source.split("\n")[stepLine - 1].trim();
-            final GherkinDialect dialect = new GherkinDialectProvider(feature.getLanguage()).getDefaultDialect();
-            for (String keyword : dialect.getStepKeywords()) {
-                if (trimmedSourceLine.startsWith(keyword)) {
-                    return keyword;
-                }
-            }
-        }
-        return "";
-    }
-
-    private TestSourceRead getTestSourceReadEvent(final String uri) {
-        if (pathToReadEventMap.containsKey(uri)) {
-            return pathToReadEventMap.get(uri);
-        }
-        return null;
-    }
-
-    /**
-     * Representation of Examples row.
-     */
-    private static class ExamplesRowWrapperNode extends Node {
-        private final int bodyRowIndex;
-
-        ExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
-            super(examplesRow.getLocation());
-            this.bodyRowIndex = bodyRowIndex;
-        }
-
-        public int getBodyRowIndex() {
-            return bodyRowIndex;
-        }
-    }
-
-    /**
-     * Representation of leaf node.
-     */
-    private static class AstNode {
-        private final Node node;
-        private final AstNode parent;
-
-        AstNode(final Node node, final AstNode parent) {
-            this.node = node;
-            this.parent = parent;
-        }
-
-        public Node getNode() {
-            return node;
-        }
-
-        public AstNode getParent() {
-            return parent;
-        }
-    }
-}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java
deleted file mode 100644
index 10498f014..000000000
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.runtime.ClassFinder;
-import cucumber.runtime.Runtime;
-import cucumber.runtime.RuntimeOptions;
-import cucumber.runtime.io.MultiLoader;
-import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.io.ResourceLoaderClassFinder;
-import cucumber.runtime.model.CucumberFeature;
-import gherkin.AstBuilder;
-import gherkin.Parser;
-import gherkin.TokenMatcher;
-import gherkin.ast.GherkinDocument;
-import io.github.glytching.junit.extension.system.SystemProperty;
-import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.Issue;
-import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Stage;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.lang.Thread.currentThread;
-import static java.util.Objects.nonNull;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("unchecked")
-class AllureCucumber2JvmTest {
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSetName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName)
-                .containsExactlyInAnyOrder("Add a to b");
-
-    }
-
-    @AllureFeatures.PassedTests
-    @Test
-    void shouldSetStatus() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetFailedStatus() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetStatusDetails() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatusDetails)
-                .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected: <15> but was: <123>");
-    }
-
-    @AllureFeatures.BrokenTests
-    @Test
-    void shouldSetBrokenStatus() {
-        final AllureResults results = runFeature("features/broken.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Stages
-    @Test
-    void shouldSetStage() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStage)
-                .containsExactlyInAnyOrder(Stage.FINISHED);
-    }
-
-    @AllureFeatures.Timeline
-    @Test
-    void shouldSetStart() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStart)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStop() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStop)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.FullName
-    @Test
-    void shouldSetFullName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
-    }
-
-    @AllureFeatures.Descriptions
-    @Test
-    void shouldSetDescription() {
-        final AllureResults results = runFeature("features/description.feature");
-
-        final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getDescription)
-                .containsExactlyInAnyOrder(
-                        expected,
-                        expected
-                );
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddDataTableAttachment() {
-        final AllureResults results = runFeature("features/datatable.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Data table", "text/tab-separated-values")
-                );
-
-        final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = results.getAttachments();
-        assertThat(attachmentFiles)
-                .containsKeys(dataTableAttachment.getSource());
-
-        final byte[] bytes = attachmentFiles.get(dataTableAttachment.getSource());
-        final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
-
-        assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
-                );
-
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddAttachments() {
-        final AllureResults results = runFeature("features/attachments.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
-                );
-
-        final List<String> attachmentContents = results.getAttachments().values().stream()
-                .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
-                .collect(Collectors.toList());
-
-        assertThat(attachmentContents)
-                .containsExactlyInAnyOrder("text attachment", "image attachment");
-    }
-
-    @AllureFeatures.Steps
-    @Test
-    void shouldAddBackgroundSteps() {
-        final AllureResults results = runFeature("features/background.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(1)
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldAddParametersFromExamples() {
-        final AllureResults results = runFeature("features/examples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-
-        assertThat(testResults.get(0).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults.get(1).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldHandleMultipleExampleTables() {
-        final AllureResults results = runFeature("features/multipleExamples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddTags() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("tag", "FeatureTag"),
-                        tuple("tag", "good")
-                );
-    }
-
-    @AllureFeatures.Links
-    @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @Test
-    void shouldAddLinks() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLinks)
-                .extracting(Link::getName, Link::getType, Link::getUrl)
-                .contains(
-                        tuple("OAT-4444", "tms", "https://example.org/tms/OAT-4444"),
-                        tuple("BUG-22400", "issue", "https://example.org/issue/BUG-22400")
-                );
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddBddLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("feature", "Test Simple Scenarios"),
-                        tuple("story", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.Timeline
-    @Test
-    void shouldThreadHostLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName)
-                .contains("host", "thread");
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldCommonLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("package", "Test Simple Scenarios"),
-                        tuple("suite", "Test Simple Scenarios"),
-                        tuple("testClass", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldProcessNotImplementedScenario() {
-        final AllureResults results = runFeature("features/undefined.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSupportDryRun() {
-        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Add a to b", Status.SKIPPED)
-                );
-    }
-
-    @AllureFeatures.Base
-    @Issue("173")
-    @Issue("164")
-    @Test
-    void shouldUseUuid() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getUuid)
-                .allMatch(uuid -> nonNull(uuid) && uuid.matches("[\\-a-z0-9]+"), "UUID");
-    }
-
-    private AllureResults runFeature(final String featureResource,
-                                     final String... moreOptions) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber2Jvm cucumber2Jvm = new AllureCucumber2Jvm(lifecycle);
-        final ClassLoader classLoader = currentThread().getContextClassLoader();
-        final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-        final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber2jvm.samples",
-                "--plugin", "null"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new RuntimeOptions(opts);
-        final Runtime runtime = new Runtime(resourceLoader, classFinder, classLoader, options);
-
-        options.addPlugin(cucumber2Jvm);
-
-        final String gherkin = readResource(featureResource);
-        Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        TokenMatcher matcher = new TokenMatcher();
-        GherkinDocument gherkinDocument = parser.parse(gherkin, matcher);
-        CucumberFeature feature = new CucumberFeature(gherkinDocument, featureResource, gherkin);
-
-        feature.sendTestSourceRead(runtime.getEventBus());
-        runtime.runFeature(feature);
-        return writer;
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBefore() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBeforeAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusBrokenOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusBrokenOnUndefinedStepsAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusSkippedOnUndefinedAndFailedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_suf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnPassedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_spu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusFailedOnFailedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sfu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-
-    private String readResource(final String resourceName) {
-        try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) {
-            return IOUtils.toString(is, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new RuntimeException("Feature file not found " + resourceName);
-        }
-    }
-}
diff --git a/allure-cucumber2-jvm/src/test/resources/features/undefined.feature b/allure-cucumber2-jvm/src/test/resources/features/undefined.feature
deleted file mode 100644
index caa0b507b..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/undefined.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Step is not implemented
-    Given hello my friend
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java
deleted file mode 100644
index 531bf58dc..000000000
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.api.HookTestStep;
-import cucumber.api.HookType;
-import cucumber.api.PendingException;
-import cucumber.api.PickleStepTestStep;
-import cucumber.api.Result;
-import cucumber.api.TestCase;
-import cucumber.api.event.EmbedEvent;
-import cucumber.api.event.EventHandler;
-import cucumber.api.event.EventPublisher;
-import cucumber.api.event.TestCaseFinished;
-import cucumber.api.event.TestCaseStarted;
-import cucumber.api.event.TestSourceRead;
-import cucumber.api.event.TestStepFinished;
-import cucumber.api.event.TestStepStarted;
-import cucumber.api.event.WriteEvent;
-import cucumber.api.formatter.Formatter;
-import gherkin.ast.Examples;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableRow;
-import gherkin.pickles.PickleCell;
-import gherkin.pickles.PickleRow;
-import gherkin.pickles.PickleTable;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.FixtureResult;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-import static io.qameta.allure.util.ResultsUtils.md5;
-
-/**
- * Allure plugin for Cucumber JVM 3.0.
- */
-@SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
-})
-public class AllureCucumber3Jvm implements Formatter {
-
-    private final AllureLifecycle lifecycle;
-
-    private final Map<String, String> scenarioUuids = new HashMap<>();
-
-    private final CucumberSourceUtils cucumberSourceUtils = new CucumberSourceUtils();
-    private Feature currentFeature;
-    private String currentFeatureFile;
-    private TestCase currentTestCase;
-    private String currentContainer;
-    private boolean forbidTestCaseStatusChange;
-
-    private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
-    private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
-    private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
-    private final EventHandler<TestStepStarted> stepStartedHandler = this::handleTestStepStarted;
-    private final EventHandler<TestStepFinished> stepFinishedHandler = this::handleTestStepFinished;
-    private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
-    private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
-
-    private static final String TXT_EXTENSION = ".txt";
-    private static final String TEXT_PLAIN = "text/plain";
-
-    @SuppressWarnings("unused")
-    public AllureCucumber3Jvm() {
-        this(Allure.getLifecycle());
-    }
-
-    public AllureCucumber3Jvm(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-    }
-
-    @Override
-    public void setEventPublisher(final EventPublisher publisher) {
-        publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
-
-        publisher.registerHandlerFor(TestCaseStarted.class, caseStartedHandler);
-        publisher.registerHandlerFor(TestCaseFinished.class, caseFinishedHandler);
-
-        publisher.registerHandlerFor(TestStepStarted.class, stepStartedHandler);
-        publisher.registerHandlerFor(TestStepFinished.class, stepFinishedHandler);
-
-        publisher.registerHandlerFor(WriteEvent.class, writeEventHandler);
-        publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
-    }
-
-    /*
-    Event Handlers
-     */
-
-    private void handleFeatureStartedHandler(final TestSourceRead event) {
-        cucumberSourceUtils.addTestSourceReadEvent(event.uri, event);
-    }
-
-    private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentTestCase = event.testCase;
-        currentFeatureFile = currentTestCase.getUri();
-        currentFeature = cucumberSourceUtils.getFeature(currentFeatureFile);
-        currentContainer = UUID.randomUUID().toString();
-        forbidTestCaseStatusChange = false;
-
-
-        final Deque<PickleTag> tags = new LinkedList<>(currentTestCase.getTags());
-
-        final LabelBuilder labelBuilder = new LabelBuilder(currentFeature, currentTestCase, tags);
-
-        final String name = currentTestCase.getName();
-        final String featureName = currentFeature.getName();
-
-        final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase))
-                .setHistoryId(getHistoryId(currentTestCase))
-                .setFullName(featureName + ": " + name)
-                .setName(name)
-                .setLabels(labelBuilder.getScenarioLabels())
-                .setLinks(labelBuilder.getScenarioLinks());
-
-        final ScenarioDefinition scenarioDefinition =
-                cucumberSourceUtils.getScenarioDefinition(currentFeatureFile, currentTestCase.getLine());
-        if (scenarioDefinition instanceof ScenarioOutline) {
-            result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition)
-            );
-        }
-
-        if (currentFeature.getDescription() != null && !currentFeature.getDescription().isEmpty()) {
-            result.setDescription(currentFeature.getDescription());
-        }
-
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase));
-    }
-
-    private void handleTestCaseFinished(final TestCaseFinished event) {
-
-        final String uuid = getTestCaseUuid(event.testCase);
-        final Optional<StatusDetails> details = getStatusDetails(event.result.getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
-        lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
-        lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
-    }
-
-    private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.testStep instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.testStep;
-            final String stepKeyword = Optional.ofNullable(
-                    cucumberSourceUtils.getKeywordFromSource(currentFeatureFile, pickleStep.getStepLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getPickleStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase), getStepUuid(pickleStep), stepResult);
-
-            pickleStep.getStepArgument().stream()
-                    .filter(PickleTable.class::isInstance)
-                    .findFirst()
-                    .ifPresent(table -> createDataTableAttachment((PickleTable) table));
-        } else if (event.testStep instanceof HookTestStep) {
-            initHook((HookTestStep) event.testStep);
-        }
-    }
-
-    private void initHook(final HookTestStep hook) {
-
-        final FixtureResult hookResult = new FixtureResult()
-                .setName(hook.getCodeLocation())
-                .setStart(System.currentTimeMillis());
-
-        if (hook.getHookType() == HookType.Before) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        }
-
-    }
-
-    private void handleTestStepFinished(final TestStepFinished event) {
-        if (event.testStep instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
-        }
-    }
-
-    private void handleWriteEvent(final WriteEvent event) {
-        lifecycle.addAttachment(
-                "Text output",
-                TEXT_PLAIN,
-                TXT_EXTENSION,
-                Objects.toString(event.text).getBytes(StandardCharsets.UTF_8)
-        );
-    }
-
-    private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.data));
-    }
-
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer;
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getPickleStep().getText() + step.getStepLine();
-    }
-
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getHookType().toString() + step.getCodeLocation();
-    }
-
-    private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri() + ":" + testCase.getLine();
-        return md5(testCaseLocation);
-    }
-
-    private Status translateTestCaseStatus(final Result testCaseResult) {
-        switch (testCaseResult.getStatus()) {
-            case FAILED:
-                return getStatus(testCaseResult.getError())
-                        .orElse(Status.FAILED);
-            case PASSED:
-                return Status.PASSED;
-            case SKIPPED:
-            case PENDING:
-                return Status.SKIPPED;
-            case AMBIGUOUS:
-            case UNDEFINED:
-            default:
-                return null;
-        }
-    }
-
-    private List<Parameter> getExamplesAsParameters(final ScenarioOutline scenarioOutline) {
-        final Optional<Examples> examplesBlock =
-                scenarioOutline.getExamples().stream()
-                        .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine() == currentTestCase.getLine())
-                        ).findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBody().stream()
-                    .filter(example -> example.getLocation().getLine() == currentTestCase.getLine())
-                    .findFirst().get();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
-                final String value = row.getCells().get(index).getValue();
-                return createParameter(name, value);
-            }).collect(Collectors.toList());
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    private void createDataTableAttachment(final PickleTable pickleTable) {
-        final List<PickleRow> rows = pickleTable.getRows();
-
-        final StringBuilder dataTableCsv = new StringBuilder();
-        if (!rows.isEmpty()) {
-            rows.forEach(dataTableRow -> {
-                dataTableCsv.append(
-                        dataTableRow.getCells().stream()
-                                .map(PickleCell::getValue)
-                                .collect(Collectors.joining("\t"))
-                );
-                dataTableCsv.append('\n');
-            });
-
-            final String attachmentSource = lifecycle
-                    .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-            lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
-        }
-    }
-
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.testStep;
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.result));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.result));
-            final StatusDetails statusDetails = getStatusDetails(event.result.getError()).get();
-
-            statusDetails.setMessage(hookStep.getHookType()
-                    .name() + " is failed: " + event.result.getError().getLocalizedMessage());
-
-            if (hookStep.getHookType() == HookType.Before) {
-                final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange = true;
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
-        }
-
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
-        lifecycle.stopFixture(uuid);
-    }
-
-    private void handlePickleStep(final TestStepFinished event) {
-
-        final Status stepStatus = translateTestCaseStatus(event.result);
-        final StatusDetails statusDetails;
-        if (event.result.getStatus() == Result.Type.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
-
-            statusDetails =
-                    getStatusDetails(new PendingException("TODO: implement me"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.result.getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
-
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange = true;
-        }
-
-        final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-        statusDetails
-                .setFlaky(tagParser.isFlaky())
-                .setMuted(tagParser.isMuted())
-                .setKnown(tagParser.isKnown());
-
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.testStep),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.testStep));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase),
-                    result -> result.setStatus(status));
-        }
-    }
-}
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/CucumberSourceUtils.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/CucumberSourceUtils.java
deleted file mode 100644
index 2f2ed0f37..000000000
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/CucumberSourceUtils.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.api.event.TestSourceRead;
-
-import gherkin.Parser;
-import gherkin.AstBuilder;
-import gherkin.TokenMatcher;
-import gherkin.ParserException;
-import gherkin.GherkinDialect;
-import gherkin.GherkinDialectProvider;
-
-import gherkin.ast.GherkinDocument;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.Node;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableRow;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-/**
- * Parts of package-private cucumber.runtime.formatter.TestSourcesModel needed for Allure 2 adapter.
- */
-final class CucumberSourceUtils {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CucumberSourceUtils.class);
-
-    private final Map<String, TestSourceRead> pathToReadEventMap = new HashMap<>();
-    private final Map<String, GherkinDocument> pathToAstMap = new HashMap<>();
-    private final Map<String, Map<Integer, AstNode>> pathToNodeMap = new HashMap<>();
-
-    public void addTestSourceReadEvent(final String path, final TestSourceRead event) {
-        pathToReadEventMap.put(path, event);
-    }
-
-    public Feature getFeature(final String path) {
-        if (!pathToAstMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToAstMap.containsKey(path)) {
-            return pathToAstMap.get(path).getFeature();
-        }
-        return null;
-    }
-
-    private void parseGherkinSource(final String path) {
-        if (!pathToReadEventMap.containsKey(path)) {
-            return;
-        }
-        final Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        final TokenMatcher matcher = new TokenMatcher();
-        try {
-            final GherkinDocument gherkinDocument = parser.parse(pathToReadEventMap.get(path).source, matcher);
-            pathToAstMap.put(path, gherkinDocument);
-            final Map<Integer, AstNode> nodeMap = new HashMap<>();
-            final AstNode currentParent = new AstNode(gherkinDocument.getFeature(), null);
-            for (ScenarioDefinition child : gherkinDocument.getFeature().getChildren()) {
-                processScenarioDefinition(nodeMap, child, currentParent);
-            }
-            pathToNodeMap.put(path, nodeMap);
-        } catch (ParserException e) {
-            LOGGER.trace(e.getMessage(), e);
-        }
-    }
-
-    private void processScenarioDefinition(
-            final Map<Integer, AstNode> nodeMap, final ScenarioDefinition child, final AstNode currentParent
-    ) {
-        final AstNode childNode = new AstNode(child, currentParent);
-        nodeMap.put(child.getLocation().getLine(), childNode);
-
-        child.getSteps().forEach(
-            step -> nodeMap.put(step.getLocation().getLine(), new AstNode(step, childNode))
-        );
-
-        if (child instanceof ScenarioOutline) {
-            processScenarioOutlineExamples(nodeMap, (ScenarioOutline) child, childNode);
-        }
-    }
-
-    private void processScenarioOutlineExamples(
-            final Map<Integer, AstNode> nodeMap, final ScenarioOutline scenarioOutline, final AstNode childNode
-    ) {
-        scenarioOutline.getExamples().forEach(examples -> {
-            final AstNode examplesNode = new AstNode(examples, childNode);
-            final TableRow headerRow = examples.getTableHeader();
-            final AstNode headerNode = new AstNode(headerRow, examplesNode);
-            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
-            IntStream.range(0, examples.getTableBody().size()).forEach(i -> {
-                final TableRow examplesRow = examples.getTableBody().get(i);
-                final Node rowNode = new CucumberSourceUtils.ExamplesRowWrapperNode(examplesRow, i);
-                final AstNode expandedScenarioNode = new AstNode(rowNode, examplesNode);
-                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
-            });
-        });
-    }
-
-    private AstNode getAstNode(final String path, final int line) {
-        if (!pathToNodeMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToNodeMap.containsKey(path)) {
-            return pathToNodeMap.get(path).get(line);
-        }
-        return null;
-    }
-
-    public ScenarioDefinition getScenarioDefinition(final String path, final int line) {
-        return getScenarioDefinition(getAstNode(path, line));
-    }
-
-    private ScenarioDefinition getScenarioDefinition(final AstNode astNode) {
-        return astNode.getNode() instanceof ScenarioDefinition
-                ? (ScenarioDefinition) astNode.getNode()
-                : (ScenarioDefinition) astNode.getParent().getParent().getNode();
-    }
-
-    public String getKeywordFromSource(final String uri, final int stepLine) {
-        final Feature feature = getFeature(uri);
-        if (feature != null) {
-            final TestSourceRead event = getTestSourceReadEvent(uri);
-            final String trimmedSourceLine = event.source.split("\n")[stepLine - 1].trim();
-            final GherkinDialect dialect = new GherkinDialectProvider(feature.getLanguage()).getDefaultDialect();
-            for (String keyword : dialect.getStepKeywords()) {
-                if (trimmedSourceLine.startsWith(keyword)) {
-                    return keyword;
-                }
-            }
-        }
-        return "";
-    }
-
-    private TestSourceRead getTestSourceReadEvent(final String uri) {
-        if (pathToReadEventMap.containsKey(uri)) {
-            return pathToReadEventMap.get(uri);
-        }
-        return null;
-    }
-
-    /**
-     * Representation of Examples row.
-     */
-    private static class ExamplesRowWrapperNode extends Node {
-        private final int bodyRowIndex;
-
-        ExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
-            super(examplesRow.getLocation());
-            this.bodyRowIndex = bodyRowIndex;
-        }
-
-        public int getBodyRowIndex() {
-            return bodyRowIndex;
-        }
-    }
-
-    /**
-     * Representation of leaf node.
-     */
-    private static class AstNode {
-        private final Node node;
-        private final AstNode parent;
-
-        AstNode(final Node node, final AstNode parent) {
-            this.node = node;
-            this.parent = parent;
-        }
-
-        public Node getNode() {
-            return node;
-        }
-
-        public AstNode getParent() {
-            return parent;
-        }
-    }
-}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java
deleted file mode 100644
index d6aaf4e46..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.runtime.ClassFinder;
-import cucumber.runtime.Runtime;
-import cucumber.runtime.RuntimeOptions;
-import cucumber.runtime.io.MultiLoader;
-import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.io.ResourceLoaderClassFinder;
-import cucumber.runtime.model.CucumberFeature;
-import gherkin.AstBuilder;
-import gherkin.Parser;
-import gherkin.TokenMatcher;
-import gherkin.ast.GherkinDocument;
-import io.github.glytching.junit.extension.system.SystemProperty;
-import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.Issue;
-import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Stage;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.lang.Thread.currentThread;
-import static java.util.Objects.nonNull;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("unchecked")
-class AllureCucumber3JvmTest {
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSetName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getName)
-                .containsExactlyInAnyOrder("Add a to b");
-
-    }
-
-    @AllureFeatures.PassedTests
-    @Test
-    void shouldSetStatus() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetFailedStatus() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetStatusDetails() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatusDetails)
-                .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected: <15> but was: <123>");
-    }
-
-    @AllureFeatures.BrokenTests
-    @Test
-    void shouldSetBrokenStatus() {
-        final AllureResults results = runFeature("features/broken.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Stages
-    @Test
-    void shouldSetStage() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStage)
-                .containsExactlyInAnyOrder(Stage.FINISHED);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStart() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStart)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStop() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStop)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.FullName
-    @Test
-    void shouldSetFullName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
-    }
-
-    @AllureFeatures.Descriptions
-    @Test
-    void shouldSetDescription() {
-        final AllureResults results = runFeature("features/description.feature");
-
-        final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getDescription)
-                .containsExactlyInAnyOrder(
-                        expected,
-                        expected
-                );
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddDataTableAttachment() {
-        final AllureResults results = runFeature("features/datatable.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Data table", "text/tab-separated-values")
-                );
-
-        final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = results.getAttachments();
-        assertThat(attachmentFiles)
-                .containsKeys(dataTableAttachment.getSource());
-
-        final byte[] bytes = attachmentFiles.get(dataTableAttachment.getSource());
-        final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
-
-        assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
-                );
-
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddAttachments() {
-        final AllureResults results = runFeature("features/attachments.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
-                );
-
-        final List<String> attachmentContents = results.getAttachments().values().stream()
-                .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
-                .collect(Collectors.toList());
-
-        assertThat(attachmentContents)
-                .containsExactlyInAnyOrder("text attachment", "image attachment");
-    }
-
-    @AllureFeatures.Steps
-    @Test
-    void shouldAddBackgroundSteps() {
-        final AllureResults results = runFeature("features/background.feature");
-
-        assertThat(results.getTestResults())
-                .hasSize(1)
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldAddParametersFromExamples() {
-        final AllureResults results = runFeature("features/examples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-
-        assertThat(testResults.get(0).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults.get(1).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldHandleMultipleExamplesPerOutline() throws IOException {
-        final AllureResults results = runFeature("features/multi-examples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldSupportTaggedExamplesBlocks() throws IOException {
-        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(1);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("tag", "ExamplesTag2")
-                );
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddTags() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("tag", "FeatureTag"),
-                        tuple("tag", "good")
-                );
-    }
-
-    @AllureFeatures.Links
-    @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @Test
-    void shouldAddLinks() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLinks)
-                .extracting(Link::getName, Link::getType, Link::getUrl)
-                .contains(
-                        tuple("OAT-4444", "tms", "https://example.org/tms/OAT-4444"),
-                        tuple("BUG-22400", "issue", "https://example.org/issue/BUG-22400")
-                );
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddBddLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("feature", "Test Simple Scenarios"),
-                        tuple("story", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.Timeline
-    @Test
-    void shouldThreadHostLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName)
-                .contains("host", "thread");
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldCommonLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("package", "Test Simple Scenarios"),
-                        tuple("suite", "Test Simple Scenarios"),
-                        tuple("testClass", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldProcessNotImplementedScenario() {
-        final AllureResults results = runFeature("features/undefined.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSupportDryRun() {
-        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Add a to b", Status.SKIPPED)
-                );
-    }
-
-    @AllureFeatures.Base
-    @Issue("173")
-    @Issue("164")
-    @Test
-    void shouldUseUuid() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getUuid)
-                .allMatch(uuid -> nonNull(uuid) && uuid.matches("[\\-a-z0-9]+"), "UUID");
-    }
-
-    private AllureResults runFeature(final String featureResource,
-                                     final String... moreOptions) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber3Jvm cucumber3Jvm = new AllureCucumber3Jvm(lifecycle);
-        final ClassLoader classLoader = currentThread().getContextClassLoader();
-        final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-        final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber3jvm.samples",
-                "--plugin", "null"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new RuntimeOptions(opts);
-        final Runtime runtime = new Runtime(resourceLoader, classFinder, classLoader, options);
-
-        options.addPlugin(cucumber3Jvm);
-        options.noSummaryPrinter();
-
-        final String gherkin = readResource(featureResource);
-        Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        TokenMatcher matcher = new TokenMatcher();
-        GherkinDocument gherkinDocument = parser.parse(gherkin, matcher);
-        CucumberFeature feature = new CucumberFeature(gherkinDocument, featureResource, gherkin);
-
-        feature.sendTestSourceRead(runtime.getEventBus());
-        runtime.runFeature(feature);
-        return writer;
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBefore() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBeforeAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusBrokenOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusBrokenOnUndefinedStepsAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusSkippedOnUndefinedAndFailedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_suf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnPassedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_spu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusFailedOnFailedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sfu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    private String readResource(final String resourceName) {
-        try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) {
-            return IOUtils.toString(is, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new RuntimeException("Feature file not found " + resourceName);
-        }
-    }
-}
diff --git a/allure-cucumber3-jvm/src/test/resources/features/attachments.feature b/allure-cucumber3-jvm/src/test/resources/features/attachments.feature
deleted file mode 100644
index 1585fbe81..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/attachments.feature
+++ /dev/null
@@ -1,8 +0,0 @@
-@attachments
-Feature: Feature with attachments
-
-  Scenario: Simple scenario with a text attachment
-    Given step with scenario write
-
-  Scenario: Simple scenario with an image attachment
-    Given step with scenario embed
\ No newline at end of file
diff --git a/allure-cucumber3-jvm/src/test/resources/features/background.feature b/allure-cucumber3-jvm/src/test/resources/features/background.feature
deleted file mode 100644
index 307f10267..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/background.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: Test Scenarios with backgrounds
-
-  Background:
-    Given cat is sad
-    And cat is murmur
-
-  Scenario: Scenario with background
-    When Pet the cat
-    Then Cat is happy
diff --git a/allure-cucumber3-jvm/src/test/resources/features/broken.feature b/allure-cucumber3-jvm/src/test/resources/features/broken.feature
deleted file mode 100644
index 42bd7ba4f..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/broken.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Exception during step
-    Given everything is broken
diff --git a/allure-cucumber3-jvm/src/test/resources/features/datatable.feature b/allure-cucumber3-jvm/src/test/resources/features/datatable.feature
deleted file mode 100644
index ea5e94d3b..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/datatable.feature
+++ /dev/null
@@ -1,8 +0,0 @@
-Feature: Test Scenarios with Data Tables
-
-  Scenario: Simple data table
-    Given users are:
-      | name    | login    | email          |
-      | Viktor  | clicman  | clicman@ya.ru  |
-      | Viktor2 | clicman2 | clicman2@ya.ru |
-
diff --git a/allure-cucumber3-jvm/src/test/resources/features/examples.feature b/allure-cucumber3-jvm/src/test/resources/features/examples.feature
deleted file mode 100644
index 23d6c5f21..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/examples.feature
+++ /dev/null
@@ -1,12 +0,0 @@
-Feature: Test Scenarios with Examples
-
-  Scenario Outline: Scenario with Positive Examples
-    Given a is <a>
-    And b is <b>
-    When I add a to b
-    Then result is <result>
-
-    Examples:
-      | a | b | result |
-      | 1 | 3 | 4      |
-      | 2 | 4 | 6      |
diff --git a/allure-cucumber3-jvm/src/test/resources/features/undefined.feature b/allure-cucumber3-jvm/src/test/resources/features/undefined.feature
deleted file mode 100644
index caa0b507b..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/undefined.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Step is not implemented
-    Given hello my friend
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
index cb87fff60..26b244ee0 100644
--- a/allure-cucumber4-jvm/build.gradle.kts
+++ b/allure-cucumber4-jvm/build.gradle.kts
@@ -1,21 +1,20 @@
 description = "Allure CucumberJVM 4.0"
 
-val agent: Configuration by configurations.creating
-
-val cucumberVersion = "4.7.2"
+val cucumberVersion = "4.8.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("io.cucumber:cucumber-core:$cucumberVersion")
-    implementation("io.cucumber:cucumber-java:$cucumberVersion")
+    compileOnly("io.cucumber:cucumber-core:$cucumberVersion")
+    compileOnly("io.cucumber:cucumber-java:$cucumberVersion")
     testImplementation("commons-io:commons-io")
-    testImplementation("io.cucumber:cucumber-testng:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
@@ -29,7 +28,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java b/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
index e6af04883..f55994b76 100644
--- a/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
+++ b/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index 57d0a95df..b5a5d429d 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 
 import cucumber.api.HookTestStep;
 import cucumber.api.HookType;
-import cucumber.api.PendingException;
 import cucumber.api.PickleStepTestStep;
 import cucumber.api.Result;
 import cucumber.api.TestCase;
+import cucumber.api.TestStep;
 import cucumber.api.event.ConcurrentEventListener;
 import cucumber.api.event.EmbedEvent;
 import cucumber.api.event.EventHandler;
@@ -39,6 +39,7 @@
 import gherkin.ast.TableRow;
 import gherkin.pickles.PickleCell;
 import gherkin.pickles.PickleRow;
+import gherkin.pickles.PickleStep;
 import gherkin.pickles.PickleTable;
 import gherkin.pickles.PickleTag;
 import io.qameta.allure.Allure;
@@ -52,11 +53,14 @@
 import io.qameta.allure.model.TestResultContainer;
 
 import java.io.ByteArrayInputStream;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -65,6 +69,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static cucumber.api.HookType.Before;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
@@ -74,22 +79,18 @@
  * Allure plugin for Cucumber JVM 4.0.
  */
 @SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+        "MultipleStringLiterals",
 })
 public class AllureCucumber4Jvm implements ConcurrentEventListener {
 
+    private static final String COLON = ":";
+
     private final AllureLifecycle lifecycle;
 
-    private final ConcurrentHashMap<String, String> scenarioUuids = new ConcurrentHashMap<>();
     private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
 
-    private final ThreadLocal<Feature> currentFeature = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentFeatureFile = new InheritableThreadLocal<>();
-    private final ThreadLocal<TestCase> currentTestCase = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentContainer = new InheritableThreadLocal<>();
-    private final ThreadLocal<Boolean> forbidTestCaseStatusChange = new InheritableThreadLocal<>();
-
     private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
     private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
     private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
@@ -98,8 +99,14 @@ public class AllureCucumber4Jvm implements ConcurrentEventListener {
     private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
     private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
 
+    private final Map<TestStep, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+    private final Map<TestCase, String> testCaseUuids = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> stepUuids = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> fixtureUuids = new ConcurrentHashMap<>();
+
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
 
     @SuppressWarnings("unused")
     public AllureCucumber4Jvm() {
@@ -124,42 +131,49 @@ public void setEventPublisher(final EventPublisher publisher) {
         publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
     }
 
-    /*
-    Event Handlers
-     */
-
     private void handleFeatureStartedHandler(final TestSourceRead event) {
         testSources.addTestSourceReadEvent(event.uri, event);
     }
 
     private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentFeatureFile.set(event.testCase.getUri());
-        currentFeature.set(testSources.getFeature(currentFeatureFile.get()));
-        currentTestCase.set(event.testCase);
-        currentContainer.set(UUID.randomUUID().toString());
-        forbidTestCaseStatusChange.set(false);
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+
+        final Deque<PickleTag> tags = new LinkedList<>(testCase.getTags());
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
+
+        final String name = testCase.getName();
 
-        final Deque<PickleTag> tags = new LinkedList<>(currentTestCase.get().getTags());
 
-        final Feature feature = currentFeature.get();
-        final LabelBuilder labelBuilder = new LabelBuilder(feature, currentTestCase.get(), tags);
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(testCase),
+                testCase.getLine()
+        );
 
-        final String name = currentTestCase.get().getName();
-        final String featureName = feature.getName();
+        final String testCaseUuid = testCaseUuids
+                .computeIfAbsent(testCase, tc -> UUID.randomUUID().toString());
 
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase.get()))
-                .setHistoryId(getHistoryId(currentTestCase.get()))
-                .setFullName(featureName + ": " + name)
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(fullName)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
         final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(currentFeatureFile.get(), currentTestCase.get().getLine());
+                testSources.getScenarioDefinition(
+                        testCase.getUri(),
+                        testCase.getLine()
+                );
+
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, currentTestCase.get())
+                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, testCase)
             );
         }
 
@@ -172,74 +186,157 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
             result.setDescription(description);
         }
 
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
-
         lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+        lifecycle.startTestCase(testCaseUuid);
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
+        }
+
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final Result result = event.result;
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
 
-        final String uuid = getTestCaseUuid(event.testCase);
-        final Optional<StatusDetails> details = getStatusDetails(event.result.getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
         lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
         lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
     }
 
     private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.testStep instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.testStep;
-            final String stepKeyword = Optional.ofNullable(
-                    testSources.getKeywordFromSource(currentFeatureFile.get(), pickleStep.getStepLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getPickleStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase.get()), getStepUuid(pickleStep), stepResult);
-
-            pickleStep.getStepArgument().stream()
-                    .filter(PickleTable.class::isInstance)
-                    .findFirst()
-                    .ifPresent(table -> createDataTableAttachment((PickleTable) table));
-        } else if (event.testStep instanceof HookTestStep) {
-            initHook((HookTestStep) event.testStep);
+        final TestCase testCase = event.getTestCase();
+        if (event.testStep instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.testStep;
+
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
+            }
+        } else if (event.testStep instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.testStep);
         }
     }
 
-    private void initHook(final HookTestStep hook) {
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
+        }
 
-        final FixtureResult hookResult = new FixtureResult()
+        final PickleStep step = pickleStep.getPickleStep();
+        final String stepKeyword = Optional
+                .ofNullable(
+                        testSources.getKeywordFromSource(
+                                testCase.getUri(),
+                                pickleStep.getStepLine()
+                        )
+                )
+                .orElse("");
+
+        final StepResult stepResult = new StepResult()
+                .setName(stepKeyword + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        final String stepUuid = stepUuids.computeIfAbsent(
+                pickleStep,
+                cl -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+
+        pickleStep.getStepArgument()
+                .stream()
+                .filter(PickleTable.class::isInstance)
+                .map(PickleTable.class::cast)
+                .findFirst()
+                .ifPresent(this::createDataTableAttachment);
+
+    }
+
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
+        }
+
+        final StepResult stepResult = new StepResult()
                 .setName(hook.getCodeLocation())
                 .setStart(System.currentTimeMillis());
 
-        if (hook.getHookType() == HookType.Before) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+        final String stepUuid = stepUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
         }
 
+
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hook, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = fixtureUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
+        if (hook.getHookType() == Before) {
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
+        } else {
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
+        }
     }
 
     private void handleTestStepFinished(final TestStepFinished event) {
         if (event.testStep instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
+            final HookTestStep hook = (HookTestStep) event.testStep;
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.result, hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.result, hook);
+            }
+        } else if (event.testStep instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.testStep;
+            handleStopStep(event.getTestCase(), event.result, pickleStep);
         }
     }
 
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == Before || hook.getHookType() == HookType.After;
+    }
+
     private void handleWriteEvent(final WriteEvent event) {
         lifecycle.addAttachment(
                 "Text output",
@@ -250,34 +347,41 @@ private void handleWriteEvent(final WriteEvent event) {
     }
 
     private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.data));
+        lifecycle.addAttachment(
+                Objects.isNull(event.name)
+                        ? "Embedding"
+                        : event.name,
+                event.mimeType,
+                null,
+                new ByteArrayInputStream(event.data)
+        );
     }
 
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer.get();
+    private String getHistoryId(final TestCase testCase) {
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLine();
+        return md5(testCaseLocation);
     }
 
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
     }
 
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getPickleStep().getText() + step.getStepLine();
-    }
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = getUriWithoutScheme(testCase);
 
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getHookType().toString() + step.getCodeLocation();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
     }
 
-    private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri() + ":" + testCase.getLine();
-        return md5(testCaseLocation);
+    private static String getUriWithoutScheme(final TestCase testCase) {
+        try {
+            return URI.create(testCase.getUri()).getSchemeSpecificPart();
+        } catch (Exception ignored) {
+            return testCase.getUri();
+        }
     }
 
     private Status translateTestCaseStatus(final Result testCaseResult) {
@@ -298,124 +402,116 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenarioOutline, final TestCase localCurrentTestCase
-    ) {
-        final Optional<Examples> examplesBlock =
-                scenarioOutline.getExamples().stream()
+            final ScenarioOutline scenario,
+            final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample =
+                scenario.getExamples().stream()
                         .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
-                        ).findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBody().stream()
-                    .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
-                    .findFirst().get();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
-                final String value = row.getCells().get(index).getValue();
-                return createParameter(name, value);
-            }).collect(Collectors.toList());
-        } else {
+                                .anyMatch(row -> row.getLocation().getLine()
+                                                 == localCurrentTestCase.getLine())
+                        )
+                        .findFirst();
+
+        if (!maybeExample.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBody().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
+                .findFirst();
+
+        if (!maybeRow.isPresent()) {
             return Collections.emptyList();
         }
+
+        final TableRow row = maybeRow.get();
+
+        return IntStream.range(0, examples.getTableHeader().getCells().size())
+                .mapToObj(index -> {
+                    final String name = examples.getTableHeader().getCells().get(index).getValue();
+                    final String value = row.getCells().get(index).getValue();
+                    return createParameter(name, value);
+                })
+                .collect(Collectors.toList());
     }
 
     private void createDataTableAttachment(final PickleTable pickleTable) {
         final List<PickleRow> rows = pickleTable.getRows();
 
         final StringBuilder dataTableCsv = new StringBuilder();
-        if (!rows.isEmpty()) {
-            rows.forEach(dataTableRow -> {
-                dataTableCsv.append(
-                        dataTableRow.getCells().stream()
-                                .map(PickleCell::getValue)
-                                .collect(Collectors.joining("\t"))
-                );
-                dataTableCsv.append('\n');
-            });
-
-            final String attachmentSource = lifecycle
-                    .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-            lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+        for (PickleRow row : rows) {
+            final String rowString = row.getCells().stream()
+                    .map(PickleCell::getValue)
+                    .collect(Collectors.joining("\t", "", "\n"));
+            dataTableCsv.append(rowString);
         }
+        final String attachmentSource = lifecycle
+                .prepareAttachment("Data table", "text/tab-separated-values", "csv");
+        lifecycle.writeAttachment(attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
     }
 
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.testStep;
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.result));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.result));
-            final StatusDetails statusDetails = getStatusDetails(event.result.getError())
-                    .orElseGet(StatusDetails::new);
-
-            final String errorMessage = event.result.getError() == null ? hookStep.getHookType()
-                    .name() + " is failed." : hookStep.getHookType()
-                    .name() + " is failed: " + event.result.getError().getLocalizedMessage();
-            statusDetails.setMessage(errorMessage);
-
-            if (hookStep.getHookType() == HookType.Before) {
-                final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange.set(true);
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook);
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
+        }
+
+        final String uuid = fixtureUuids.get(hook);
+        if (Objects.isNull(uuid)) {
+            // maybe throw an exception?
+            return;
         }
 
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
         lifecycle.stopFixture(uuid);
+
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
     }
 
-    private void handlePickleStep(final TestStepFinished event) {
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final TestStep step) {
+        final String stepUuid = stepUuids.get(step);
+        if (Objects.isNull(stepUuid)) {
+            // maybe exception?
+            return;
+        }
 
-        final Status stepStatus = translateTestCaseStatus(event.result);
-        final StatusDetails statusDetails;
-        if (event.result.getStatus() == Result.Type.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-            statusDetails =
-                    getStatusDetails(new PendingException("TODO: implement me"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.result.getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
+        final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange.set(true);
-        }
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == Result.Type.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
 
-        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        final TagParser tagParser = new TagParser(feature, testCase);
         statusDetails
                 .setFlaky(tagParser.isFlaky())
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.testStep),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.testStep));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange.get()) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()),
-                    result -> result.setStatus(status));
-        }
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
     }
 }
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
index ef7dcf7f1..fbcbb3f10 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -49,8 +49,8 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
-class LabelBuilder {
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
+final class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
 
@@ -89,33 +89,34 @@ class LabelBuilder {
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagString.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tagString.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
         final String featureName = feature.getName();
         final String uri = scenario.getUri();
 
-        getScenarioLabels().addAll(Arrays.asList(
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
                 createFeatureLabel(featureName),
@@ -129,7 +130,7 @@ class LabelBuilder {
 
         featurePackage(uri, featureName)
                 .map(ResultsUtils::createPackageLabel)
-                .ifPresent(getScenarioLabels()::add);
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -150,13 +151,13 @@ private Label getTagLabel(final PickleTag tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(ResultsUtils.createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
             LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
index dec84aeb5..0c6f76e44 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -52,13 +52,13 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
+               || feature.getTags().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final PickleTag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
                 .contains(tag.getName().toUpperCase());
     }
 
diff --git a/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber4-jvm/src/main/resources/META-INF/aop-ajc.xml
similarity index 74%
rename from allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml
rename to allure-cucumber4-jvm/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-cucumber4-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
     </aspects>
-</aspectj>
\ No newline at end of file
+</aspectj>
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index a24160f02..9cc09bbfc 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,25 +15,17 @@
  */
 package io.qameta.allure.cucumber4jvm;
 
-import cucumber.runtime.ClassFinder;
-import cucumber.runtime.FeatureSupplier;
+import cucumber.runtime.FeaturePathFeatureSupplier;
 import cucumber.runtime.Runtime;
 import cucumber.runtime.io.MultiLoader;
 import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.io.ResourceLoaderClassFinder;
-import cucumber.runtime.model.CucumberFeature;
-import gherkin.AstBuilder;
-import gherkin.Parser;
-import gherkin.TokenMatcher;
-import gherkin.ast.GherkinDocument;
-import gherkin.events.PickleEvent;
-import gherkin.pickles.Compiler;
-import gherkin.pickles.Pickle;
+import cucumber.runtime.model.FeatureLoader;
+import io.cucumber.core.model.FeatureWithLines;
 import io.cucumber.core.options.CommandlineOptionsParser;
 import io.cucumber.core.options.RuntimeOptions;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -44,22 +36,19 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import org.apache.commons.io.IOUtils;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -67,23 +56,24 @@
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static java.lang.Thread.currentThread;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
+import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
 
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureCucumber4JvmTest {
 
     @AllureFeatures.Base
     @Test
     void shouldSetName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
@@ -92,22 +82,22 @@ void shouldSetName() {
     @AllureFeatures.PassedTests
     @Test
     void shouldSetStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
     }
 
     @AllureFeatures.FailedTests
     @Test
     void shouldSetFailedStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.FAILED);
@@ -116,23 +106,21 @@ void shouldSetFailedStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetStatusDetails() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected [123] but found [15]");
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
     }
 
     @AllureFeatures.BrokenTests
     @Test
     void shouldSetBrokenStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/broken.feature");
+        final AllureResults results = runFeature("features/broken.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.BROKEN);
@@ -141,10 +129,9 @@ void shouldSetBrokenStatus() {
     @AllureFeatures.Stages
     @Test
     void shouldSetStage() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStage)
                 .containsExactlyInAnyOrder(Stage.FINISHED);
@@ -154,11 +141,10 @@ void shouldSetStage() {
     @Test
     void shouldSetStart() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStart)
                 .allMatch(v -> v >= before && v <= after);
@@ -168,11 +154,10 @@ void shouldSetStart() {
     @Test
     void shouldSetStop() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStop)
                 .allMatch(v -> v >= before && v <= after);
@@ -181,25 +166,23 @@ void shouldSetStop() {
     @AllureFeatures.FullName
     @Test
     void shouldSetFullName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
     }
 
     @AllureFeatures.Descriptions
     @Test
     void shouldSetDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/description.feature");
+        final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -211,13 +194,12 @@ void shouldSetDescription() {
     @AllureFeatures.Descriptions
     @Test
     void shouldSetScenarioDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/scenario_description.feature");
+        final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -229,10 +211,9 @@ void shouldSetScenarioDescription() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddDataTableAttachment() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/datatable.feature");
+        final AllureResults results = runFeature("features/datatable.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -246,7 +227,7 @@ void shouldAddDataTableAttachment() {
                 );
 
         final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = writer.getAttachments();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(dataTableAttachment.getSource());
 
@@ -254,9 +235,11 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
                 );
 
     }
@@ -264,10 +247,9 @@ void shouldAddDataTableAttachment() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddAttachments() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/attachments.feature");
+        final AllureResults results = runFeature("features/attachments.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -278,10 +260,10 @@ void shouldAddAttachments() {
                 .extracting(Attachment::getName, Attachment::getType)
                 .containsExactlyInAnyOrder(
                         tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
+                        tuple("Embedding", "image/png")
                 );
 
-        final List<String> attachmentContents = writer.getAttachments().values().stream()
+        final List<String> attachmentContents = results.getAttachments().values().stream()
                 .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
                 .collect(Collectors.toList());
 
@@ -292,30 +274,28 @@ void shouldAddAttachments() {
     @AllureFeatures.Steps
     @Test
     void shouldAddBackgroundSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/background.feature");
+        final AllureResults results = runFeature("features/background.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1)
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
                 );
     }
 
     @AllureFeatures.Parameters
     @Test
     void shouldAddParametersFromExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature");
+        final AllureResults results = runFeature("features/examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -339,10 +319,9 @@ void shouldAddParametersFromExamples() {
     @AllureFeatures.Parameters
     @Test
     void shouldHandleMultipleExamplesPerOutline() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature");
+        final AllureResults results = runFeature("features/multi-examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -359,10 +338,9 @@ void shouldHandleMultipleExamplesPerOutline() {
     @AllureFeatures.Parameters
     @Test
     void shouldSupportTaggedExamplesBlocks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1);
@@ -385,10 +363,9 @@ void shouldSupportTaggedExamplesBlocks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddTags() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -405,10 +382,9 @@ void shouldAddTags() {
     @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
     @Test
     void shouldAddLinks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLinks)
@@ -422,10 +398,9 @@ void shouldAddLinks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddBddLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -439,10 +414,9 @@ void shouldAddBddLabels() {
     @AllureFeatures.Timeline
     @Test
     void shouldAddThreadHostLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -453,16 +427,15 @@ void shouldAddThreadHostLabels() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddCommonLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
                 .extracting(Label::getName, Label::getValue)
                 .contains(
-                        tuple(PACKAGE_LABEL_NAME, "features.tags_feature.Test Simple Scenarios"),
+                        tuple(PACKAGE_LABEL_NAME, "src.test.resources.features.tags_feature.Test Simple Scenarios"),
                         tuple(SUITE_LABEL_NAME, "Test Simple Scenarios"),
                         tuple(TEST_CLASS_LABEL_NAME, "Add a to b")
                 );
@@ -471,20 +444,21 @@ void shouldAddCommonLabels() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessUndefinedSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/undefined.feature");
+        final AllureResults results = runFeature("features/undefined.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is undefined", null),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -492,10 +466,9 @@ void shouldProcessUndefinedSteps() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessPendingExceptionsInSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/pending.feature");
+        final AllureResults results = runFeature("features/pending.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -503,19 +476,18 @@ void shouldProcessPendingExceptionsInSteps() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is yet to be implemented", Status.SKIPPED),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForSimpleFeatures() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature", "--dry-run");
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -525,10 +497,10 @@ void shouldSupportDryRunForSimpleFeatures() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.SKIPPED),
-                        tuple("And  b is 10", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 5", Status.SKIPPED),
+                        tuple("And b is 10", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
@@ -536,103 +508,140 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .startsWith(
-                        tuple("Simple scenario with Before and After hooks", Status.SKIPPED)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHook()", Status.SKIPPED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHook()", Status.SKIPPED)
                 );
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForScenarios() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
-                .isEqualTo("2f9965e6cc23d5c5f9c5268a2ff6f921");
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
 
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature", "--threads", "2");
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("16d71185f704fe21cbc98f9eaa3292bb", "d64467f9921e0209deae4286f5599f5d");
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
+
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
-    private Comparator<TestResult> byHistoryId =
-            Comparator.comparing(TestResult::getHistoryId);
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
 
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/parallel.feature", "--threads", "3");
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(3);
 
-        List<TestResult> sortedTestResults = testResults.stream().sorted(byHistoryId).collect(Collectors.toList());
-
-        assertThat(sortedTestResults.get(0).getSteps())
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  a is 1",
-                        "And  b is 3",
-                        "When  I add a to b",
-                        "Then  result is 4"
+                .containsSubsequence(
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
                 );
 
-        assertThat(sortedTestResults.get(1).getSteps())
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  a is 2",
-                        "And  b is 4",
-                        "When  I add a to b",
-                        "Then  result is 6"
+                .containsSubsequence(
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
                 );
 
-        assertThat(sortedTestResults.get(2).getSteps())
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  a is 7",
-                        "And  b is 8",
-                        "When  I add a to b",
-                        "Then  result is 15"
+                .containsSubsequence(
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
                 );
     }
 
@@ -640,68 +649,64 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED),
-                        tuple("Simple scenario with Before hook with Exception", Status.SKIPPED),
-                        tuple("Simple scenario with After hook with Exception", Status.BROKEN)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(1).getSteps())
+        assertThat(tr2.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHookWithException()", Status.FAILED)
                 );
 
-
-        assertThat(testResults.get(2).getSteps())
+        assertThat(tr3.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHookWithException()", Status.FAILED)
@@ -712,83 +717,99 @@ void shouldDisplayHooksAsStages() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldHandleAmbigiousStepsExceptions() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/ambigious.feature");
+        final AllureResults results = runFeature("features/ambigious.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                        tuple("Simple scenario with ambigious steps", null)
                 );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactly(
-                        tuple("When  ambigious step present", null),
-                        tuple("Then  something bad should happen", Status.SKIPPED)
-                );
-    }
-
-    private byte runFeature(final AllureResultsWriterStub writer,
-                            final String featureResource,
-                            final String... moreOptions) {
-
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
-        final ClassLoader classLoader = currentThread().getContextClassLoader();
-        final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-        final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber4jvm.samples",
-                "--plugin", "null_summary"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new CommandlineOptionsParser().parse(opts).build();
-        boolean mt = options.isMultiThreaded();
-
-        FeatureSupplier featureSupplier = () -> {
-            try {
-                final String gherkin = readResource(featureResource);
-                Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-                TokenMatcher matcher = new TokenMatcher();
-                GherkinDocument gherkinDocument = parser.parse(gherkin, matcher);
-                List<PickleEvent> pickleEvents = compilePickles(gherkinDocument, featureResource);
-                CucumberFeature feature = new CucumberFeature(gherkinDocument, URI.create(featureResource), gherkin, pickleEvents);
-
-                return Collections.singletonList(feature);
-            } catch (IOException e) {
-                return Collections.EMPTY_LIST;
-            }
-        };
-        final Runtime runtime = Runtime.builder()
-                .withResourceLoader(resourceLoader)
-                .withClassFinder(classFinder)
-                .withClassLoader(classLoader)
-                .withRuntimeOptions(options)
-                .withAdditionalPlugins(cucumber4Jvm)
-                .withFeatureSupplier(featureSupplier)
-                .build();
-
-        runtime.run();
-        return runtime.exitStatus();
-    }
-
-    private static List<PickleEvent> compilePickles(GherkinDocument gherkinDocument, String resource) {
-        if (gherkinDocument.getFeature() == null) {
-            return Collections.emptyList();
-        }
-        List<PickleEvent> pickleEvents = new ArrayList<>();
-        for (Pickle pickle : new Compiler().compile(gherkinDocument)) {
-            pickleEvents.add(new PickleEvent(resource, pickle));
-        }
-        return pickleEvents;
-    }
-
-
-    private String readResource(final String resourceName) throws IOException {
-        try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) {
-            return IOUtils.toString(is, StandardCharsets.UTF_8);
-        }
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
+                );
     }
+
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("x-provided", "cucumberjvm5-test-provided")
+                );
+    }
+
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
+                );
+    }
+
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
+            final ClassLoader classLoader = currentThread().getContextClassLoader();
+            final ResourceLoader resourceLoader = new MultiLoader(classLoader);
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber4jvm.samples",
+                    "--plugin", "null_summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser()
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber4Jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
+    }
+
+
 }
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
index 3f76659a8..2b43b9ea8 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
index e72223093..c0308b3f3 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
index b2ff7f6e6..b39835696 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
index 7ff508ab6..53e0895c5 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
index d903702e6..4faa730ab 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
index 3a2f55c93..68aa59fd7 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author letsrokk (Dmitry Mayer).
@@ -36,12 +36,12 @@ public void afterHook(){
 
     @Before("@BeforeHookWithException")
     public void beforeHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
     public void afterHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @Before("@bp")
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
index c1ab1b965..7d122c577 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..41bd4bfa6
--- /dev/null
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber4jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
index 7325cc855..f2baf281a 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -46,7 +46,10 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assert.assertEquals(this.c, arg1);
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
     }
 
 }
diff --git a/allure-cucumber4-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber4-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber4-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-cucumber-jvm/src/test/resources/features/simple.feature b/allure-cucumber4-jvm/src/test/resources/features/same/simple.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/simple.feature
rename to allure-cucumber4-jvm/src/test/resources/features/same/simple.feature
diff --git a/allure-cucumber5-jvm/build.gradle.kts b/allure-cucumber5-jvm/build.gradle.kts
index c74c9a200..4e0d44c9d 100644
--- a/allure-cucumber5-jvm/build.gradle.kts
+++ b/allure-cucumber5-jvm/build.gradle.kts
@@ -1,25 +1,23 @@
 description = "Allure CucumberJVM 5.0"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "5.1.2"
 val cucumberGherkinVersion = "5.1.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
-    implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
-    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("commons-io:commons-io")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("io.cucumber:cucumber-testng:$cucumberVersion")
-    testImplementation("commons-io:commons-io")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
@@ -33,7 +31,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index 932e0df7a..7b7a0f0e9 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,47 +15,78 @@
  */
 package io.qameta.allure.cucumber5jvm;
 
-
-import gherkin.ast.*;
-import io.qameta.allure.cucumber5jvm.testsourcemodel.TestSourcesModelProxy;
+import gherkin.ast.Examples;
+import gherkin.ast.Feature;
+import gherkin.ast.ScenarioDefinition;
+import gherkin.ast.ScenarioOutline;
+import gherkin.ast.TableRow;
 import io.cucumber.plugin.ConcurrentEventListener;
-import io.cucumber.plugin.event.*;
+import io.cucumber.plugin.event.DataTableArgument;
+import io.cucumber.plugin.event.EmbedEvent;
+import io.cucumber.plugin.event.EventHandler;
+import io.cucumber.plugin.event.EventPublisher;
+import io.cucumber.plugin.event.HookTestStep;
+import io.cucumber.plugin.event.HookType;
+import io.cucumber.plugin.event.PickleStepTestStep;
+import io.cucumber.plugin.event.Result;
+import io.cucumber.plugin.event.Step;
+import io.cucumber.plugin.event.StepArgument;
+import io.cucumber.plugin.event.TestCase;
+import io.cucumber.plugin.event.TestCaseFinished;
+import io.cucumber.plugin.event.TestCaseStarted;
+import io.cucumber.plugin.event.TestSourceRead;
+import io.cucumber.plugin.event.TestStep;
+import io.cucumber.plugin.event.TestStepFinished;
+import io.cucumber.plugin.event.TestStepStarted;
+import io.cucumber.plugin.event.WriteEvent;
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.*;
+import io.qameta.allure.cucumber5jvm.testsourcemodel.TestSourcesModelProxy;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
 
 import java.io.ByteArrayInputStream;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static io.qameta.allure.util.ResultsUtils.*;
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static io.qameta.allure.util.ResultsUtils.md5;
 
 /**
  * Allure plugin for Cucumber JVM 5.0.
  */
 @SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+        "MultipleStringLiterals",
 })
 public class AllureCucumber5Jvm implements ConcurrentEventListener {
 
+    private static final String COLON = ":";
+
     private final AllureLifecycle lifecycle;
 
-    private final ConcurrentHashMap<String, String> scenarioUuids = new ConcurrentHashMap<>();
     private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
 
-    private final ThreadLocal<Feature> currentFeature = new InheritableThreadLocal<>();
-    private final ThreadLocal<URI> currentFeatureFile = new InheritableThreadLocal<>();
-    private final ThreadLocal<TestCase> currentTestCase = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentContainer = new InheritableThreadLocal<>();
-    private final ThreadLocal<Boolean> forbidTestCaseStatusChange = new InheritableThreadLocal<>();
-
     private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
     private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
     private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
@@ -64,8 +95,13 @@ public class AllureCucumber5Jvm implements ConcurrentEventListener {
     private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
     private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
 
+    private final Map<TestStep, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> stepUuids = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> fixtureUuids = new ConcurrentHashMap<>();
+
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
 
     @SuppressWarnings("unused")
     public AllureCucumber5Jvm() {
@@ -76,9 +112,6 @@ public AllureCucumber5Jvm(final AllureLifecycle lifecycle) {
         this.lifecycle = lifecycle;
     }
 
-    /*
-    Event Handlers
-     */
     @Override
     public void setEventPublisher(final EventPublisher publisher) {
         publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
@@ -98,33 +131,43 @@ private void handleFeatureStartedHandler(final TestSourceRead event) {
     }
 
     private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentFeatureFile.set(event.getTestCase().getUri());
-        currentFeature.set(testSources.getFeature(currentFeatureFile.get()));
-        currentTestCase.set(event.getTestCase());
-        currentContainer.set(UUID.randomUUID().toString());
-        forbidTestCaseStatusChange.set(false);
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-        final Deque<String> tags = new LinkedList<>(currentTestCase.get().getTags());
+        final Deque<String> tags = new LinkedList<>(testCase.getTags());
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
-        final Feature feature = currentFeature.get();
-        final LabelBuilder labelBuilder = new LabelBuilder(feature, currentTestCase.get(), tags);
+        final String name = testCase.getName();
 
-        final String name = currentTestCase.get().getName();
-        final String featureName = feature.getName();
+
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(testCase),
+                testCase.getLine()
+        );
+
+        final String testCaseUuid = testCase.getId().toString();
 
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase.get()))
-                .setHistoryId(getHistoryId(currentTestCase.get()))
-                .setFullName(featureName + ": " + name)
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(fullName)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
         final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(currentFeatureFile.get(), currentTestCase.get().getLine());
+                testSources.getScenarioDefinition(
+                        testCase.getUri(),
+                        testCase.getLine()
+                );
+
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, currentTestCase.get())
+                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, testCase)
             );
         }
 
@@ -137,75 +180,131 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
             result.setDescription(description);
         }
 
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
-
         lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+        lifecycle.startTestCase(testCaseUuid);
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final String uuid = testCase.getId().toString();
+        final Result result = event.getResult();
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
 
-        final String uuid = getTestCaseUuid(event.getTestCase());
-        final Optional<StatusDetails> details = getStatusDetails(event.getResult().getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
         lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
         lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
     }
 
     private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.getTestStep() instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
-            final String stepKeyword = Optional.ofNullable(
-                    testSources.getKeywordFromSource(currentFeatureFile.get(), pickleStep.getStep().getLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase.get()), getStepUuid(pickleStep), stepResult);
+        final TestCase testCase = event.getTestCase();
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
 
-            final StepArgument stepArgument = pickleStep.getStep().getArgument();
-            if (stepArgument instanceof DataTableArgument) {
-                final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
-                createDataTableAttachment(dataTableArgument);
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
             }
-        } else if (event.getTestStep() instanceof HookTestStep) {
-            initHook((HookTestStep) event.getTestStep());
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.getTestStep());
         }
     }
 
-    private void initHook(final HookTestStep hook) {
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCase.getId().toString();
+        final Step step = pickleStep.getStep();
 
-        final FixtureResult hookResult = new FixtureResult()
+        final StepResult stepResult = new StepResult()
+                .setName(step.getKeyWord() + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        final String stepUuid = stepUuids.computeIfAbsent(
+                pickleStep,
+                cl -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+
+        final StepArgument stepArgument = step.getArgument();
+        if (stepArgument instanceof DataTableArgument) {
+            final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+            createDataTableAttachment(dataTableArgument);
+        }
+    }
+
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+        final StepResult stepResult = new StepResult()
                 .setName(hook.getCodeLocation())
                 .setStart(System.currentTimeMillis());
 
+        final String stepUuid = stepUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hook, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = fixtureUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
         if (hook.getHookType() == HookType.BEFORE) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
         } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
         }
-
     }
 
     private void handleTestStepFinished(final TestStepFinished event) {
         if (event.getTestStep() instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.getResult(), hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.getResult(), hook);
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
+            handleStopStep(event.getTestCase(), event.getResult(), pickleStep);
         }
     }
 
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == HookType.BEFORE || hook.getHookType() == HookType.AFTER;
+    }
+
     private void handleWriteEvent(final WriteEvent event) {
         lifecycle.addAttachment(
                 "Text output",
@@ -216,36 +315,25 @@ private void handleWriteEvent(final WriteEvent event) {
     }
 
     private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.getData()));
+        lifecycle.addAttachment(event.name, event.getMediaType(), null, new ByteArrayInputStream(event.getData()));
     }
 
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer.get();
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getStep().getText() + step.getStep().getLine();
+    private String getHistoryId(final TestCase testCase) {
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLine();
+        return md5(testCaseLocation);
     }
 
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getHookType().toString() + step.getCodeLocation();
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
     }
 
-    private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri().toString()
-                .substring(testCase.getUri().toString().lastIndexOf('/') + 1)
-                + ":" + testCase.getLine();
-        return md5(testCaseLocation);
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
     }
 
     private Status translateTestCaseStatus(final Result testCaseResult) {
@@ -266,42 +354,48 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenarioOutline, final TestCase localCurrentTestCase
-    ) {
-        final Optional<Examples> examplesBlock =
-                scenarioOutline.getExamples().stream()
+            final ScenarioOutline scenario,
+            final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample =
+                scenario.getExamples().stream()
                         .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
-                        ).findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBody().stream()
-                    .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
-                    .findFirst().get();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
-                final String value = row.getCells().get(index).getValue();
-                return createParameter(name, value);
-            }).collect(Collectors.toList());
-        } else {
+                                .anyMatch(row -> row.getLocation().getLine()
+                                                 == localCurrentTestCase.getLine())
+                        )
+                        .findFirst();
+
+        if (!maybeExample.isPresent()) {
             return Collections.emptyList();
         }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBody().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
+                .findFirst();
+
+        if (!maybeRow.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final TableRow row = maybeRow.get();
+
+        return IntStream.range(0, examples.getTableHeader().getCells().size())
+                .mapToObj(index -> {
+                    final String name = examples.getTableHeader().getCells().get(index).getValue();
+                    final String value = row.getCells().get(index).getValue();
+                    return createParameter(name, value);
+                })
+                .collect(Collectors.toList());
     }
 
     private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
         final List<List<String>> rowsInTable = dataTableArgument.cells();
         final StringBuilder dataTableCsv = new StringBuilder();
-        for (List<String> columns:rowsInTable) {
+        for (List<String> columns : rowsInTable) {
             if (!columns.isEmpty()) {
-                for (int i = 0; i < columns.size(); i++) {
-                    if (i == columns.size() - 1) {
-                        dataTableCsv.append(columns.get(i));
-                    } else {
-                        dataTableCsv.append(columns.get(i));
-                        dataTableCsv.append('\t');
-                    }
-                }
-                dataTableCsv.append('\n');
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                dataTableCsv.append(rowValue);
             }
         }
         final String attachmentSource = lifecycle
@@ -310,81 +404,65 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
                 new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
     }
 
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.getTestStep();
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.getResult()));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.getResult()));
-            final StatusDetails statusDetails = getStatusDetails(event.getResult().getError())
-                    .orElseGet(StatusDetails::new);
-
-            final String errorMessage = event.getResult().getError() == null ? hookStep.getHookType()
-                    .name() + " is failed." : hookStep.getHookType()
-                    .name() + " is failed: " + event.getResult().getError().getLocalizedMessage();
-            statusDetails.setMessage(errorMessage);
-
-            if (hookStep.getHookType() == HookType.BEFORE) {
-                final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange.set(true);
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook);
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
         }
 
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
+        final String uuid = fixtureUuids.get(hook);
+        if (Objects.isNull(uuid)) {
+            // maybe throw an exception?
+            return;
+        }
+
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
         lifecycle.stopFixture(uuid);
+
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
     }
 
-    private void handlePickleStep(final TestStepFinished event) {
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final TestStep step) {
+        final String stepUuid = stepUuids.get(step);
+        if (Objects.isNull(stepUuid)) {
+            // maybe exception?
+            return;
+        }
 
-        final Status stepStatus = translateTestCaseStatus(event.getResult());
-        final StatusDetails statusDetails;
-        if (event.getResult().getStatus() == io.cucumber.plugin.event.Status.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-            statusDetails =
-                    getStatusDetails(new IllegalStateException("Undefined Step. Please add step definition"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.getResult().getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
+        final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange.set(true);
-        }
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
 
-        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        final TagParser tagParser = new TagParser(feature, testCase);
         statusDetails
                 .setFlaky(tagParser.isFlaky())
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.getTestStep()),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.getTestStep()));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange.get()) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()),
-                    result -> result.setStatus(status));
-        }
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
     }
 }
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
index 68063215e..95d11ab57 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -86,47 +86,48 @@ class LabelBuilder {
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tag.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tag.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
         final String featureName = feature.getName();
         final URI uri = scenario.getUri();
 
-        getScenarioLabels().addAll(Arrays.asList(
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
                 createFeatureLabel(featureName),
                 createStoryLabel(scenario.getName()),
                 createSuiteLabel(featureName),
                 createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber4jvm"),
+                createFrameworkLabel("cucumber5jvm"),
                 createLanguageLabel("java"),
                 createLabel("gherkin_uri", uri.toString())
         ));
 
         featurePackage(uri.toString(), featureName)
                 .map(ResultsUtils::createPackageLabel)
-                .ifPresent(getScenarioLabels()::add);
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -147,13 +148,13 @@ private Label getTagLabel(final String tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(ResultsUtils.createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
             LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
index a6e5724b7..ced0a37f1 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -51,13 +51,13 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+               || feature.getTags().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final String tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
                 .contains(tag.toUpperCase());
     }
 
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
index 94057e3a6..2b3909c62 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
@@ -1,3 +1,18 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package io.qameta.allure.cucumber5jvm.testsourcemodel;
 
 import gherkin.AstBuilder;
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
index 084b7bd4b..0e459841e 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-
 public class TestSourcesModelProxy {
 
     private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
diff --git a/allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber5-jvm/src/main/resources/META-INF/aop-ajc.xml
similarity index 74%
rename from allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml
rename to allure-cucumber5-jvm/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-cucumber5-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
     </aspects>
-</aspectj>
\ No newline at end of file
+</aspectj>
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index 15509de7e..f4de28513 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,15 +18,15 @@
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.core.feature.FeatureParser;
 import io.cucumber.core.feature.FeatureWithLines;
+import io.cucumber.core.options.CommandlineOptionsParser;
+import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.resource.ClassLoaders;
 import io.cucumber.core.runtime.FeaturePathFeatureSupplier;
 import io.cucumber.core.runtime.Runtime;
-import io.cucumber.core.options.CommandlineOptionsParser;
-import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -37,38 +37,46 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
-
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
+import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
 
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureCucumber5JvmTest {
 
     @AllureFeatures.Base
     @Test
     void shouldSetName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
@@ -77,22 +85,22 @@ void shouldSetName() {
     @AllureFeatures.PassedTests
     @Test
     void shouldSetStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
     }
 
     @AllureFeatures.FailedTests
     @Test
     void shouldSetFailedStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.FAILED);
@@ -101,23 +109,21 @@ void shouldSetFailedStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetStatusDetails() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected [123] but found [15]");
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
     }
 
     @AllureFeatures.BrokenTests
     @Test
     void shouldSetBrokenStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/broken.feature");
+        final AllureResults results = runFeature("features/broken.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.BROKEN);
@@ -126,10 +132,9 @@ void shouldSetBrokenStatus() {
     @AllureFeatures.Stages
     @Test
     void shouldSetStage() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStage)
                 .containsExactlyInAnyOrder(Stage.FINISHED);
@@ -139,11 +144,10 @@ void shouldSetStage() {
     @Test
     void shouldSetStart() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStart)
                 .allMatch(v -> v >= before && v <= after);
@@ -153,11 +157,10 @@ void shouldSetStart() {
     @Test
     void shouldSetStop() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStop)
                 .allMatch(v -> v >= before && v <= after);
@@ -166,25 +169,23 @@ void shouldSetStop() {
     @AllureFeatures.FullName
     @Test
     void shouldSetFullName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
     }
 
     @AllureFeatures.Descriptions
     @Test
     void shouldSetDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/description.feature");
+        final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -196,13 +197,12 @@ void shouldSetDescription() {
     @AllureFeatures.Descriptions
     @Test
     void shouldSetScenarioDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/scenario_description.feature");
+        final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -214,10 +214,9 @@ void shouldSetScenarioDescription() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddDataTableAttachment() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/datatable.feature");
+        final AllureResults results = runFeature("features/datatable.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -231,7 +230,7 @@ void shouldAddDataTableAttachment() {
                 );
 
         final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = writer.getAttachments();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(dataTableAttachment.getSource());
 
@@ -239,9 +238,11 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
                 );
 
     }
@@ -249,10 +250,9 @@ void shouldAddDataTableAttachment() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddAttachments() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/attachments.feature");
+        final AllureResults results = runFeature("features/attachments.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -263,10 +263,10 @@ void shouldAddAttachments() {
                 .extracting(Attachment::getName, Attachment::getType)
                 .containsExactlyInAnyOrder(
                         tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
+                        tuple("ImageAttachment", "image/png")
                 );
 
-        final List<String> attachmentContents = writer.getAttachments().values().stream()
+        final List<String> attachmentContents = results.getAttachments().values().stream()
                 .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
                 .collect(Collectors.toList());
 
@@ -277,30 +277,28 @@ void shouldAddAttachments() {
     @AllureFeatures.Steps
     @Test
     void shouldAddBackgroundSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/background.feature");
+        final AllureResults results = runFeature("features/background.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1)
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
                 );
     }
 
     @AllureFeatures.Parameters
     @Test
     void shouldAddParametersFromExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature");
+        final AllureResults results = runFeature("features/examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -324,10 +322,9 @@ void shouldAddParametersFromExamples() {
     @AllureFeatures.Parameters
     @Test
     void shouldHandleMultipleExamplesPerOutline() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature");
+        final AllureResults results = runFeature("features/multi-examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -344,10 +341,9 @@ void shouldHandleMultipleExamplesPerOutline() {
     @AllureFeatures.Parameters
     @Test
     void shouldSupportTaggedExamplesBlocks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1);
@@ -370,10 +366,9 @@ void shouldSupportTaggedExamplesBlocks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddTags() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -390,10 +385,9 @@ void shouldAddTags() {
     @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
     @Test
     void shouldAddLinks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLinks)
@@ -407,10 +401,9 @@ void shouldAddLinks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddBddLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -424,10 +417,9 @@ void shouldAddBddLabels() {
     @AllureFeatures.Timeline
     @Test
     void shouldAddThreadHostLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -438,10 +430,9 @@ void shouldAddThreadHostLabels() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddCommonLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -456,20 +447,21 @@ void shouldAddCommonLabels() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessUndefinedSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/undefined.feature");
+        final AllureResults results = runFeature("features/undefined.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is undefined", null),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -477,10 +469,9 @@ void shouldProcessUndefinedSteps() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessPendingExceptionsInSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/pending.feature");
+        final AllureResults results = runFeature("features/pending.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -488,19 +479,18 @@ void shouldProcessPendingExceptionsInSteps() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is yet to be implemented", Status.SKIPPED),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForSimpleFeatures() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature", "--dry-run");
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -510,10 +500,10 @@ void shouldSupportDryRunForSimpleFeatures() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.SKIPPED),
-                        tuple("And  b is 10", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 5", Status.SKIPPED),
+                        tuple("And b is 10", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
@@ -521,101 +511,140 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .startsWith(
-                        tuple("Simple scenario with Before and After hooks", Status.SKIPPED)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHook()", Status.SKIPPED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHook()", Status.SKIPPED)
                 );
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForScenarios() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
-                .isEqualTo("8eea9ed4458a49d418859d1398580671");
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
 
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature", "--threads", "2");
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("42a7821e775ec18b112f92e96f0510a5", "afb27d131ed8d41b3f867895a26d2590");
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
     }
 
-    private Comparator<TestResult> byHistoryId =
-            Comparator.comparing(TestResult::getHistoryId);
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
+
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
 
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/parallel.feature", "--threads", "3");
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(3);
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 1",
-                        "And  b is 3",
-                        "When  I add a to b",
-                        "Then  result is 4")
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 2",
-                                "And  b is 4",
-                                "When  I add a to b",
-                                "Then  result is 6")
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 7",
-                                "And  b is 8",
-                                "When  I add a to b",
-                                "Then  result is 15")
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
                 );
     }
 
@@ -623,68 +652,64 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED),
-                        tuple("Simple scenario with Before hook with Exception", Status.SKIPPED),
-                        tuple("Simple scenario with After hook with Exception", Status.BROKEN)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(1).getSteps())
+        assertThat(tr2.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
                 );
 
-
-        assertThat(testResults.get(2).getSteps())
+        assertThat(tr3.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
@@ -695,52 +720,100 @@ void shouldDisplayHooksAsStages() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldHandleAmbigiousStepsExceptions() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/ambigious.feature");
+        final AllureResults results = runFeature("features/ambigious.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                        tuple("Simple scenario with ambigious steps", null)
                 );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactly(
-                        tuple("When  ambigious step present", null),
-                        tuple("Then  something bad should happen", Status.SKIPPED)
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
                 );
     }
 
-    private byte runFeature(final AllureResultsWriterStub writer,
-                            final String featureResource,
-                            final String... moreOptions) {
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("x-provided", "cucumberjvm5-test-provided")
+                );
+    }
 
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber5Jvm cucumber5Jvm = new AllureCucumber5Jvm(lifecycle);
-        Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber5jvm.samples",
-                "--plugin", "null_summary"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/"+featureResource);
-        final RuntimeOptions options = new CommandlineOptionsParser().parse(opts).addFeature(featureWithLines).build();
-        boolean mt = options.isMultiThreaded();
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
 
-        EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
-        FeatureParser parser = new FeatureParser(bus::generateId);
-        FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(classLoader, options, parser);
+        final List<TestResult> testResults = results.getTestResults();
 
-        final Runtime runtime = Runtime.builder()
-                .withClassLoader(classLoader)
-                .withRuntimeOptions(options)
-                .withAdditionalPlugins(cucumber5Jvm)
-                .withFeatureSupplier(supplier)
-                .build();
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
 
-        runtime.run();
-        return runtime.exitStatus();
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
+                );
+    }
+
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber5Jvm cucumber5jvm = new AllureCucumber5Jvm(lifecycle);
+            final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber5jvm.samples",
+                    "--plugin", "null_summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser()
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+            final FeatureParser parser = new FeatureParser(bus::generateId);
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber5jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
     }
+
+
 }
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
index bf219907f..f2a15b537 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
index e3a335a9e..8439cb453 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
index 5f9177674..135a0bb19 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
index 6a78e6bf9..d9ee5ce1a 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
index a75c68849..10ecd8bc9 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
index ece9f875b..857683726 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author letsrokk (Dmitry Mayer).
@@ -36,12 +36,12 @@ public void afterHook(){
 
     @Before("@BeforeHookWithException")
     public void beforeHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
     public void afterHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @Before("@bp")
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
index 29ee3cbf4..52a8da1a5 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..20c73a7fa
--- /dev/null
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber5jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
index a81c7a212..01c1c1534 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -46,7 +46,10 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assert.assertEquals(this.c, arg1);
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
     }
 
 }
diff --git a/allure-cucumber5-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber5-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber5-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-cucumber2-jvm/src/test/resources/features/simple.feature b/allure-cucumber5-jvm/src/test/resources/features/same/simple.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/simple.feature
rename to allure-cucumber5-jvm/src/test/resources/features/same/simple.feature
diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
similarity index 58%
rename from allure-cucumber-jvm/build.gradle.kts
rename to allure-cucumber6-jvm/build.gradle.kts
index 172806f45..cbe2c710c 100644
--- a/allure-cucumber-jvm/build.gradle.kts
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -1,21 +1,21 @@
-description = "Allure CucumberJVM Integration"
+description = "Allure CucumberJVM 6.0"
 
-val agent: Configuration by configurations.creating
-
-val cucumberVersion = "1.2.5"
+val cucumberVersion = "6.10.2"
+val cucumberGherkinVersion = "18.0.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("info.cukes:cucumber-core:$cucumberVersion")
-    implementation("info.cukes:cucumber-java:$cucumberVersion")
-    implementation("info.cukes:gherkin:2.12.2")
+    compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
+    compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("commons-io:commons-io")
-    testImplementation("info.cukes:cucumber-testng:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
@@ -24,14 +24,11 @@ dependencies {
 tasks.jar {
     manifest {
         attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.cucumberjvm"
+                "Automatic-Module-Name" to "io.qameta.allure.cucumber6jvm"
         ))
     }
 }
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
new file mode 100644
index 000000000..19e1fbb1a
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -0,0 +1,444 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm;
+
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario.Examples;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.TableRow;
+import io.cucumber.plugin.ConcurrentEventListener;
+import io.cucumber.plugin.event.DataTableArgument;
+import io.cucumber.plugin.event.EmbedEvent;
+import io.cucumber.plugin.event.EventHandler;
+import io.cucumber.plugin.event.EventPublisher;
+import io.cucumber.plugin.event.HookTestStep;
+import io.cucumber.plugin.event.HookType;
+import io.cucumber.plugin.event.PickleStepTestStep;
+import io.cucumber.plugin.event.Result;
+import io.cucumber.plugin.event.Step;
+import io.cucumber.plugin.event.StepArgument;
+import io.cucumber.plugin.event.TestCase;
+import io.cucumber.plugin.event.TestCaseFinished;
+import io.cucumber.plugin.event.TestCaseStarted;
+import io.cucumber.plugin.event.TestSourceRead;
+import io.cucumber.plugin.event.TestStepFinished;
+import io.cucumber.plugin.event.TestStepStarted;
+import io.cucumber.plugin.event.WriteEvent;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.cucumber6jvm.testsourcemodel.TestSourcesModelProxy;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static io.qameta.allure.util.ResultsUtils.md5;
+
+/**
+ * Allure plugin for Cucumber JVM 6.0.
+ */
+@SuppressWarnings({
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+})
+public class AllureCucumber6Jvm implements ConcurrentEventListener {
+
+    private static final String COLON = ":";
+
+    private final AllureLifecycle lifecycle;
+
+    private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
+
+    private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
+    private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
+    private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
+    private final EventHandler<TestStepStarted> stepStartedHandler = this::handleTestStepStarted;
+    private final EventHandler<TestStepFinished> stepFinishedHandler = this::handleTestStepFinished;
+    private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
+    private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
+
+    private final Map<UUID, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+
+    private static final String TXT_EXTENSION = ".txt";
+    private static final String TEXT_PLAIN = "text/plain";
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
+
+    @SuppressWarnings("unused")
+    public AllureCucumber6Jvm() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureCucumber6Jvm(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void setEventPublisher(final EventPublisher publisher) {
+        publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
+
+        publisher.registerHandlerFor(TestCaseStarted.class, caseStartedHandler);
+        publisher.registerHandlerFor(TestCaseFinished.class, caseFinishedHandler);
+
+        publisher.registerHandlerFor(TestStepStarted.class, stepStartedHandler);
+        publisher.registerHandlerFor(TestStepFinished.class, stepFinishedHandler);
+
+        publisher.registerHandlerFor(WriteEvent.class, writeEventHandler);
+        publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
+    }
+
+    private void handleFeatureStartedHandler(final TestSourceRead event) {
+        testSources.addTestSourceReadEvent(event.getUri(), event);
+    }
+
+    private void handleTestCaseStarted(final TestCaseStarted event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+
+        final Deque<String> tags = new LinkedList<>(testCase.getTags());
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
+
+        final String name = testCase.getName();
+
+
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(testCase),
+                testCase.getLocation().getLine()
+        );
+
+        final String testCaseUuid = testCase.getId().toString();
+
+        final TestResult result = new TestResult()
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(fullName)
+                .setName(name)
+                .setLabels(labelBuilder.getScenarioLabels())
+                .setLinks(labelBuilder.getScenarioLinks());
+
+        final Scenario scenarioDefinition =
+                testSources.getScenarioDefinition(
+                        testCase.getUri(),
+                        testCase.getLocation().getLine()
+                );
+
+        if (scenarioDefinition.getExamplesList() != null) {
+            result.setParameters(
+                    getExamplesAsParameters(scenarioDefinition, testCase)
+            );
+        }
+
+        final String description = Stream.of(feature.getDescription(), scenarioDefinition.getDescription())
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.joining("\n"));
+
+        if (!description.isEmpty()) {
+            result.setDescription(description);
+        }
+
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestCase(testCaseUuid);
+    }
+
+    private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final String uuid = testCase.getId().toString();
+        final Result result = event.getResult();
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
+
+        lifecycle.stopTestCase(uuid);
+        lifecycle.writeTestCase(uuid);
+    }
+
+    private void handleTestStepStarted(final TestStepStarted event) {
+        final TestCase testCase = event.getTestCase();
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.getTestStep());
+        }
+    }
+
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCase.getId().toString();
+        final Step step = pickleStep.getStep();
+
+        final StepResult stepResult = new StepResult()
+                .setName(step.getKeyword() + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, pickleStep.getId().toString(), stepResult);
+
+        final StepArgument stepArgument = step.getArgument();
+        if (stepArgument instanceof DataTableArgument) {
+            final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+            createDataTableAttachment(dataTableArgument);
+        }
+    }
+
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+        final StepResult stepResult = new StepResult()
+                .setName(hook.getCodeLocation())
+                .setStart(System.currentTimeMillis());
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, hook.getId().toString(), stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+
+        final UUID hookId = hook.getId();
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hookId, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = hookId.toString();
+        if (hook.getHookType() == HookType.BEFORE) {
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
+        } else {
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
+        }
+    }
+
+    private void handleTestStepFinished(final TestStepFinished event) {
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.getResult(), hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.getResult(), hook.getId());
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
+            handleStopStep(event.getTestCase(), event.getResult(), pickleStep.getId());
+        }
+    }
+
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == HookType.BEFORE || hook.getHookType() == HookType.AFTER;
+    }
+
+    private void handleWriteEvent(final WriteEvent event) {
+        lifecycle.addAttachment(
+                "Text output",
+                TEXT_PLAIN,
+                TXT_EXTENSION,
+                Objects.toString(event.getText()).getBytes(StandardCharsets.UTF_8)
+        );
+    }
+
+    private void handleEmbedEvent(final EmbedEvent event) {
+        lifecycle.addAttachment(event.name, event.getMediaType(), null, new ByteArrayInputStream(event.getData()));
+    }
+
+    private String getHistoryId(final TestCase testCase) {
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLocation().getLine();
+        return md5(testCaseLocation);
+    }
+
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
+    }
+
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
+    }
+
+    private Status translateTestCaseStatus(final Result testCaseResult) {
+        switch (testCaseResult.getStatus()) {
+            case FAILED:
+                return getStatus(testCaseResult.getError())
+                        .orElse(Status.FAILED);
+            case PASSED:
+                return Status.PASSED;
+            case SKIPPED:
+            case PENDING:
+                return Status.SKIPPED;
+            case AMBIGUOUS:
+            case UNDEFINED:
+            default:
+                return null;
+        }
+    }
+
+    private List<Parameter> getExamplesAsParameters(
+            final Scenario scenario,
+            final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample =
+                scenario.getExamplesList().stream()
+                        .filter(example -> example.getTableBodyList().stream()
+                                .anyMatch(row -> row.getLocation().getLine()
+                                                 == localCurrentTestCase.getLocation().getLine())
+                        )
+                        .findFirst();
+
+        if (!maybeExample.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBodyList().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLocation().getLine())
+                .findFirst();
+
+        if (!maybeRow.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final TableRow row = maybeRow.get();
+
+        return IntStream.range(0, examples.getTableHeader().getCellsList().size())
+                .mapToObj(index -> {
+                    final String name = examples.getTableHeader().getCellsList().get(index).getValue();
+                    final String value = row.getCellsList().get(index).getValue();
+                    return createParameter(name, value);
+                })
+                .collect(Collectors.toList());
+    }
+
+    private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
+        final List<List<String>> rowsInTable = dataTableArgument.cells();
+        final StringBuilder dataTableCsv = new StringBuilder();
+        for (List<String> columns : rowsInTable) {
+            if (!columns.isEmpty()) {
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                dataTableCsv.append(rowValue);
+            }
+        }
+        final String attachmentSource = lifecycle
+                .prepareAttachment("Data table", "text/tab-separated-values", "csv");
+        lifecycle.writeAttachment(attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+    }
+
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook.getId());
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
+        }
+
+        final String uuid = hook.getId().toString();
+
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopFixture(uuid);
+
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
+    }
+
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final UUID stepId) {
+        final Feature feature = testSources.getFeature(testCase.getUri());
+
+        final Status stepStatus = translateTestCaseStatus(eventResult);
+
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        final String stepUuid = stepId.toString();
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
+    }
+}
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
similarity index 55%
rename from allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java
rename to allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
index 2401d6481..0ac417ea1 100644
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,42 +13,42 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm;
+package io.qameta.allure.cucumber6jvm;
 
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.plugin.event.TestCase;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
+import io.qameta.allure.util.ResultsUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
 import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
 import static io.qameta.allure.util.ResultsUtils.createHostLabel;
-import static io.qameta.allure.util.ResultsUtils.createIssueLink;
+import static io.qameta.allure.util.ResultsUtils.createLabel;
 import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
-import static io.qameta.allure.util.ResultsUtils.createLink;
-import static io.qameta.allure.util.ResultsUtils.createPackageLabel;
-import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
 import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
 import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
-import static io.qameta.allure.util.ResultsUtils.createTagLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
-import static io.qameta.allure.util.ResultsUtils.createTmsLink;
 
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -61,20 +61,15 @@ class LabelBuilder {
     private final List<Label> scenarioLabels = new ArrayList<>();
     private final List<Link> scenarioLinks = new ArrayList<>();
 
-    LabelBuilder(final Feature feature, final TestCase scenario, final Deque<PickleTag> tags) {
+    LabelBuilder(final Feature feature, final TestCase scenario, final Deque<String> tags) {
         final TagParser tagParser = new TagParser(feature, scenario);
 
-        getScenarioLabels().add(createFeatureLabel(feature.getName()));
-        getScenarioLabels().add(createStoryLabel(scenario.getName()));
-
         while (tags.peek() != null) {
-            final PickleTag tag = tags.remove();
-
-            final String tagString = tag.getName();
+            final String tag = tags.remove();
 
-            if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
+            if (tag.contains(COMPOSITE_TAG_DELIMITER)) {
 
-                final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
+                final String[] tagParts = tag.split(COMPOSITE_TAG_DELIMITER, 2);
                 if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
                     // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
                     continue;
@@ -85,44 +80,54 @@ class LabelBuilder {
 
                 // Handle composite named links
                 if (tagKey.startsWith(PLAIN_LINK + ".")) {
-                    tryHandleNamedLink(tagString);
+                    tryHandleNamedLink(tag);
                     continue;
                 }
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(createSeverityLabel(tagString.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tag.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
-        getScenarioLabels().addAll(Arrays.asList(
+        final String featureName = feature.getName();
+        final URI uri = scenario.getUri();
+
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
-                createPackageLabel(feature.getName()),
-                createSuiteLabel(feature.getName()),
+                createFeatureLabel(featureName),
+                createStoryLabel(scenario.getName()),
+                createSuiteLabel(featureName),
                 createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber3jvm"),
-                createLanguageLabel("java")
+                createFrameworkLabel("cucumber6jvm"),
+                createLanguageLabel("java"),
+                createLabel("gherkin_uri", uri.toString())
         ));
+
+        featurePackage(uri.toString(), featureName)
+                .map(ResultsUtils::createPackageLabel)
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -133,8 +138,8 @@ public List<Link> getScenarioLinks() {
         return scenarioLinks;
     }
 
-    private Label getTagLabel(final PickleTag tag) {
-        return createTagLabel(tag.getName().substring(1));
+    private Label getTagLabel(final String tag) {
+        return ResultsUtils.createTagLabel(tag.substring(1));
     }
 
     /**
@@ -143,17 +148,45 @@ private Label getTagLabel(final PickleTag tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
-            LOGGER.warn("Composite named tag {} is not matches regex {}. skipping", tagString,
+            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
         }
     }
 
+    private Optional<String> featurePackage(final String uriString, final String featureName) {
+        final Optional<URI> maybeUri = safeUri(uriString);
+        if (!maybeUri.isPresent()) {
+            return Optional.empty();
+        }
+        URI uri = maybeUri.get();
+
+        if (!uri.isOpaque()) {
+            final URI work = new File("").toURI();
+            uri = work.relativize(uri);
+        }
+        final String schemeSpecificPart = uri.normalize().getSchemeSpecificPart();
+        final Stream<String> folders = Stream.of(schemeSpecificPart.replaceAll("\\.", "_").split("/"));
+        final Stream<String> name = Stream.of(featureName);
+        return Optional.of(Stream.concat(folders, name)
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.joining(".")));
+    }
+
+    private static Optional<URI> safeUri(final String uri) {
+        try {
+            return Optional.of(URI.create(uri));
+        } catch (Exception e) {
+            LOGGER.debug("could not parse feature uri {}", uri, e);
+        }
+        return Optional.empty();
+    }
 }
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/TagParser.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
similarity index 62%
rename from allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/TagParser.java
rename to allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
index e20fdb21e..ada27215b 100644
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/TagParser.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm;
+package io.qameta.allure.cucumber6jvm;
 
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.plugin.event.TestCase;
 import io.qameta.allure.SeverityLevel;
 
 import java.util.Arrays;
@@ -38,35 +37,35 @@ class TagParser {
         this.scenario = scenario;
     }
 
-    protected boolean isFlaky() {
+    public boolean isFlaky() {
         return getStatusDetailByTag(FLAKY);
     }
 
-    protected boolean isMuted() {
+    public boolean isMuted() {
         return getStatusDetailByTag(MUTED);
     }
 
-    protected boolean isKnown() {
+    public boolean isKnown() {
         return getStatusDetailByTag(KNOWN);
     }
 
-    protected boolean getStatusDetailByTag(final String tagName) {
+    private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+               || feature.getTagsList().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
-    protected boolean isResultTag(final PickleTag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
-                .contains(tag.getName().toUpperCase());
+    public boolean isResultTag(final String tag) {
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
+                .contains(tag.toUpperCase());
     }
 
-    protected boolean isPureSeverityTag(final PickleTag tag) {
+    public boolean isPureSeverityTag(final String tag) {
         return Arrays.stream(SeverityLevel.values())
                 .map(SeverityLevel::value)
                 .map(value -> "@" + value)
-                .anyMatch(value -> value.equalsIgnoreCase(tag.getName()));
+                .anyMatch(value -> value.equalsIgnoreCase(tag));
     }
 
 }
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
new file mode 100644
index 000000000..2bdc4b09b
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
@@ -0,0 +1,186 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm.testsourcemodel;
+
+import io.cucumber.gherkin.Gherkin;
+import io.cucumber.messages.Messages;
+import io.cucumber.messages.Messages.GherkinDocument;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Background;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.FeatureChild;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.FeatureChild.RuleChild;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario.Examples;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Step;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.TableRow;
+import io.cucumber.messages.internal.com.google.protobuf.GeneratedMessageV3;
+import io.cucumber.plugin.event.TestSourceRead;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static io.cucumber.gherkin.Gherkin.makeSourceEnvelope;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+
+final class TestSourcesModel {
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final Map<URI, GherkinDocument> pathToAstMap = new HashMap<>();
+    private final Map<URI, Map<Integer, AstNode>> pathToNodeMap = new HashMap<>();
+
+    public static Scenario getScenarioDefinition(final AstNode astNode) {
+        AstNode candidate = astNode;
+        while (candidate != null && !(candidate.node instanceof Scenario)) {
+            candidate = candidate.parent;
+        }
+        return candidate == null ? null : (Scenario) candidate.node;
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        pathToReadEventMap.put(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        if (!pathToAstMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToAstMap.containsKey(path)) {
+            return pathToAstMap.get(path).getFeature();
+        }
+        return null;
+    }
+
+    private void parseGherkinSource(final URI path) {
+        if (!pathToReadEventMap.containsKey(path)) {
+            return;
+        }
+        final String source = pathToReadEventMap.get(path).getSource();
+
+        final List<Messages.Envelope> sources = singletonList(
+                makeSourceEnvelope(source, path.toString()));
+
+        final List<Messages.Envelope> envelopes = Gherkin.fromSources(
+                sources,
+                true,
+                true,
+                true,
+                () -> String.valueOf(UUID.randomUUID())).collect(toList());
+
+        final GherkinDocument gherkinDocument = envelopes.stream()
+                .filter(Messages.Envelope::hasGherkinDocument)
+                .map(Messages.Envelope::getGherkinDocument)
+                .findFirst()
+                .orElse(null);
+
+        pathToAstMap.put(path, gherkinDocument);
+        final Map<Integer, AstNode> nodeMap = new HashMap<>();
+        final AstNode currentParent = createAstNode(gherkinDocument.getFeature(), null);
+        for (FeatureChild child : gherkinDocument.getFeature().getChildrenList()) {
+            processFeatureDefinition(nodeMap, child, currentParent);
+        }
+        pathToNodeMap.put(path, nodeMap);
+
+    }
+
+    private void processFeatureDefinition(
+            final Map<Integer, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
+        if (child.hasBackground()) {
+            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
+        } else if (child.hasScenario()) {
+            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
+        } else if (child.hasRule()) {
+            final AstNode childNode = createAstNode(child.getRule(), currentParent);
+            nodeMap.put(child.getRule().getLocation().getLine(), childNode);
+            for (RuleChild ruleChild : child.getRule().getChildrenList()) {
+                processRuleDefinition(nodeMap, ruleChild, childNode);
+            }
+        }
+    }
+
+    private void processBackgroundDefinition(
+            final Map<Integer, AstNode> nodeMap, final Background background, final AstNode currentParent
+    ) {
+        final AstNode childNode = createAstNode(background, currentParent);
+        nodeMap.put(background.getLocation().getLine(), childNode);
+        for (Step step : background.getStepsList()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
+        }
+    }
+
+    private void processScenarioDefinition(
+            final Map<Integer, AstNode> nodeMap, final Scenario child, final AstNode currentParent) {
+        final AstNode childNode = createAstNode(child, currentParent);
+        nodeMap.put(child.getLocation().getLine(), childNode);
+        for (Step step : child.getStepsList()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
+        }
+        if (child.getExamplesCount() > 0) {
+            processScenarioOutlineExamples(nodeMap, child, childNode);
+        }
+    }
+
+    private void processRuleDefinition(
+            final Map<Integer, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
+        if (child.hasBackground()) {
+            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
+        } else if (child.hasScenario()) {
+            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
+        }
+    }
+
+    private void processScenarioOutlineExamples(
+            final Map<Integer, AstNode> nodeMap, final Scenario scenarioOutline, final AstNode parent
+    ) {
+        for (Examples examples : scenarioOutline.getExamplesList()) {
+            final AstNode examplesNode = createAstNode(examples, parent);
+            final TableRow headerRow = examples.getTableHeader();
+            final AstNode headerNode = createAstNode(headerRow, examplesNode);
+            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
+            for (int i = 0; i < examples.getTableBodyCount(); ++i) {
+                final TableRow examplesRow = examples.getTableBody(i);
+                final AstNode expandedScenarioNode = createAstNode(examplesRow, examplesNode);
+                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
+            }
+        }
+    }
+
+    public AstNode getAstNode(final URI path, final int line) {
+        if (!pathToNodeMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToNodeMap.containsKey(path)) {
+            return pathToNodeMap.get(path).get(line);
+        }
+        return null;
+    }
+
+    private AstNode createAstNode(final GeneratedMessageV3 node, final AstNode astNode) {
+        return new AstNode(node, astNode);
+    }
+
+    private static class AstNode {
+        private final GeneratedMessageV3 node;
+        private final AstNode parent;
+
+        AstNode(final GeneratedMessageV3 node, final AstNode parent) {
+            this.node = node;
+            this.parent = parent;
+        }
+    }
+}
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
new file mode 100644
index 000000000..228f1623a
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -0,0 +1,75 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm.testsourcemodel;
+
+import io.cucumber.gherkin.GherkinDialect;
+import io.cucumber.gherkin.GherkinDialectProvider;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario;
+import io.cucumber.plugin.event.TestSourceRead;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestSourcesModelProxy {
+
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final TestSourcesModel testSources;
+
+    public TestSourcesModelProxy() {
+        this.testSources = new TestSourcesModel();
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        this.pathToReadEventMap.put(path, event);
+        testSources.addTestSourceReadEvent(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        return testSources.getFeature(path);
+    }
+
+    public Scenario getScenarioDefinition(final URI path, final int line) {
+        return TestSourcesModel.getScenarioDefinition(testSources.getAstNode(path, line));
+    }
+
+    public String getKeywordFromSource(final URI uri, final int stepLine) {
+        return this.getKeywordFromSourceInternal(uri, stepLine);
+    }
+
+    private String getKeywordFromSourceInternal(final URI uri, final int stepLine) {
+        final Feature feature = getFeature(uri);
+        if (feature != null) {
+            final TestSourceRead event = this.getTestSourceReadEvent(uri);
+            final String trimmedSourceLine = event.getSource().split("\n")[stepLine - 1].trim();
+            final GherkinDialect dialect = new GherkinDialectProvider(feature.getLanguage()).getDefaultDialect();
+            for (String keyword : dialect.getStepKeywords()) {
+                if (trimmedSourceLine.startsWith(keyword)) {
+                    return keyword;
+                }
+            }
+        }
+        return "";
+    }
+
+    private TestSourceRead getTestSourceReadEvent(final URI uri) {
+        if (this.pathToReadEventMap.containsKey(uri)) {
+            return pathToReadEventMap.get(uri);
+        }
+        return null;
+    }
+}
diff --git a/allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber6-jvm/src/main/resources/META-INF/aop-ajc.xml
similarity index 74%
rename from allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml
rename to allure-cucumber6-jvm/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-cucumber6-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
     </aspects>
-</aspectj>
\ No newline at end of file
+</aspectj>
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
new file mode 100644
index 000000000..8cfbd31bf
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -0,0 +1,817 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm;
+
+import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.core.feature.FeatureParser;
+import io.cucumber.core.feature.FeatureWithLines;
+import io.cucumber.core.options.CommandlineOptionsParser;
+import io.cucumber.core.options.RuntimeOptions;
+import io.cucumber.core.resource.ClassLoaders;
+import io.cucumber.core.runtime.FeaturePathFeatureSupplier;
+import io.cucumber.core.runtime.Runtime;
+import io.cucumber.core.runtime.TimeServiceEventBus;
+import io.github.glytching.junit.extension.system.SystemProperty;
+import io.github.glytching.junit.extension.system.SystemPropertyExtension;
+import io.qameta.allure.Step;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Clock;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.md5;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
+import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class AllureCucumber6JvmTest {
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSetName() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder("Add a to b");
+    }
+
+    @AllureFeatures.PassedTests
+    @Test
+    void shouldSetStatus() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetFailedStatus() {
+        final AllureResults results = runFeature("features/failed.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.FAILED);
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetStatusDetails() {
+        final AllureResults results = runFeature("features/failed.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatusDetails)
+                .extracting(StatusDetails::getMessage)
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldSetBrokenStatus() {
+        final AllureResults results = runFeature("features/broken.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.BROKEN);
+    }
+
+    @AllureFeatures.Stages
+    @Test
+    void shouldSetStage() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStage)
+                .containsExactlyInAnyOrder(Stage.FINISHED);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runFeature("features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runFeature("features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.FullName
+    @Test
+    void shouldSetFullName() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getFullName)
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetDescription() {
+        final AllureResults results = runFeature("features/description.feature");
+
+        final String expected = "This is description for current feature.\n"
+                                + "It should appear on each scenario in report";
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected,
+                        expected
+                );
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetScenarioDescription() {
+        final AllureResults results = runFeature("features/scenario_description.feature");
+
+        final String expected = "This is description for current feature.\n"
+                                + "It should appear on each scenario in report";
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected + "\n    scenario description 1",
+                        expected + "\n    scenario description 2"
+                );
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAddDataTableAttachment() {
+        final AllureResults results = runFeature("features/datatable.feature");
+
+        final List<Attachment> attachments = results.getTestResults().stream()
+                .map(TestResult::getSteps)
+                .flatMap(Collection::stream)
+                .map(StepResult::getAttachments)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+
+        assertThat(attachments)
+                .extracting(Attachment::getName, Attachment::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("Data table", "text/tab-separated-values")
+                );
+
+        final Attachment dataTableAttachment = attachments.iterator().next();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
+        assertThat(attachmentFiles)
+                .containsKeys(dataTableAttachment.getSource());
+
+        final byte[] bytes = attachmentFiles.get(dataTableAttachment.getSource());
+        final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
+
+        assertThat(attachmentContent)
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
+                );
+
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAddAttachments() {
+        final AllureResults results = runFeature("features/attachments.feature");
+
+        final List<Attachment> attachments = results.getTestResults().stream()
+                .map(TestResult::getSteps)
+                .flatMap(Collection::stream)
+                .map(StepResult::getAttachments)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+
+        assertThat(attachments)
+                .extracting(Attachment::getName, Attachment::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("TextAttachment", "text/plain"),
+                        tuple("ImageAttachment", "image/png")
+                );
+
+        final List<String> attachmentContents = results.getAttachments().values().stream()
+                .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
+                .collect(Collectors.toList());
+
+        assertThat(attachmentContents)
+                .containsExactlyInAnyOrder("text attachment", "image attachment");
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldAddBackgroundSteps() {
+        final AllureResults results = runFeature("features/background.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
+                );
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldAddParametersFromExamples() {
+        final AllureResults results = runFeature("features/examples.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2);
+
+        assertThat(testResults.get(0).getParameters())
+                .hasSize(3);
+
+        assertThat(testResults.get(1).getParameters())
+                .hasSize(3);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldHandleMultipleExamplesPerOutline() {
+        final AllureResults results = runFeature("features/multi-examples.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldSupportTaggedExamplesBlocks() {
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("tag", "ExamplesTag2")
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddTags() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("tag", "FeatureTag"),
+                        tuple("tag", "good")
+                );
+    }
+
+    @AllureFeatures.Links
+    @ExtendWith(SystemPropertyExtension.class)
+    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
+    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @Test
+    void shouldAddLinks() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getType, Link::getUrl)
+                .contains(
+                        tuple("OAT-4444", "tms", "https://example.org/tms/OAT-4444"),
+                        tuple("BUG-22400", "issue", "https://example.org/issue/BUG-22400")
+                );
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddBddLabels() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("feature", "Test Simple Scenarios"),
+                        tuple("story", "Add a to b")
+                );
+    }
+
+    @AllureFeatures.Timeline
+    @Test
+    void shouldAddThreadHostLabels() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName)
+                .contains("host", "thread");
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddCommonLabels() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple(PACKAGE_LABEL_NAME, "src.test.resources.features.tags_feature.Test Simple Scenarios"),
+                        tuple(SUITE_LABEL_NAME, "Test Simple Scenarios"),
+                        tuple(TEST_CLASS_LABEL_NAME, "Add a to b")
+                );
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessUndefinedSteps() {
+        final AllureResults results = runFeature("features/undefined.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
+                );
+    }
+
+    @AllureFeatures.SkippedTests
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessPendingExceptionsInSteps() {
+        final AllureResults results = runFeature("features/pending.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.SKIPPED);
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
+                );
+    }
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForSimpleFeatures() {
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("And b is 10", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForHooks() {
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
+                );
+
+        assertThat(tr1.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults.get(0).getHistoryId())
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getHistoryId)
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
+
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
+
+    @AllureFeatures.Parallel
+    @Test
+    void shouldProcessScenariosInParallelMode() {
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsSubsequence(
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsSubsequence(
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsSubsequence(
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Stages
+    @Test
+    void shouldDisplayHooksAsStages() {
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
+
+        assertThat(tr1.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
+                );
+
+        assertThat(tr2.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
+                );
+
+
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
+                );
+
+        assertThat(tr3.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
+                );
+
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldHandleAmbigiousStepsExceptions() {
+        final AllureResults results = runFeature("features/ambigious.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Simple scenario with ambigious steps", null)
+                );
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
+                );
+    }
+
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm6-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("x-provided", "cucumberjvm6-test-provided")
+                );
+    }
+
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
+                );
+    }
+
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
+            final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber6jvm.samples",
+                    "--plugin", "null_summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser(System.out)
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+            final FeatureParser parser = new FeatureParser(bus::generateId);
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber6jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
+    }
+}
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
new file mode 100644
index 000000000..8d8a22dfe
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
@@ -0,0 +1,40 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm.samples;
+
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AmbigiousSteps {
+
+    @When("^ambigious step (.+)$")
+    public void ambigious_1() {
+        // nothing here
+    }
+
+    @When("^ambigious step ([a-z]+)$")
+    public void ambigious_2() {
+        // nothing here
+    }
+
+    @Then("^something bad should happen")
+    public void somethingBadStep(){
+        //nothing here
+    }
+}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/AttachmentSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
similarity index 59%
rename from allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/AttachmentSteps.java
rename to allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
index 8b9b4a69e..b3f397a3b 100644
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,31 +13,27 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm.samples;
+package io.qameta.allure.cucumber6jvm.samples;
 
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
+import io.cucumber.java.Scenario;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Given;
 
-public class AttachmentSteps
-{
+public class AttachmentSteps {
     private Scenario scenario;
 
     @Before("@attachments")
-    public void setup(Scenario scenario)
-    {
+    public void setup(Scenario scenario) {
         this.scenario = scenario;
     }
 
     @Given("step with scenario write")
-    public void stepWithScenarioWrite()
-    {
-        scenario.write("text attachment");
+    public void stepWithScenarioWrite() {
+        scenario.attach("text attachment".getBytes(), "text/plain", "TextAttachment");
     }
 
     @Given("step with scenario embed")
-    public void stepWithScenarioEmbed()
-    {
-        scenario.embed("image attachment".getBytes(), "image/png");
+    public void stepWithScenarioEmbed() {
+        scenario.attach("image attachment".getBytes(), "image/png", "ImageAttachment");
     }
 }
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
similarity index 82%
rename from allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BackgroundFeatureSteps.java
rename to allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
index d93a51ba2..f8b041039 100644
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm.samples;
+package io.qameta.allure.cucumber6jvm.samples;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BrokenFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
similarity index 86%
rename from allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BrokenFeatureSteps.java
rename to allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
index 6fab5b44e..22b64b97b 100644
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumberjvm.samples;
+package io.qameta.allure.cucumber6jvm.samples;
 
-import cucumber.api.java.en.Given;
+import io.cucumber.java.en.Given;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/DatatableFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
similarity index 86%
rename from allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/DatatableFeatureSteps.java
rename to allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
index 342d0d634..416732c3d 100644
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm.samples;
+package io.qameta.allure.cucumber6jvm.samples;
 
-import cucumber.api.java.en.Given;
 import io.cucumber.datatable.DataTable;
+import io.cucumber.java.en.Given;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/Hooks.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
similarity index 56%
rename from allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/Hooks.java
rename to allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
index 70cf9af8b..fcc108bf7 100644
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/Hooks.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,12 +13,36 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm.samples;
+package io.qameta.allure.cucumber6jvm.samples;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import org.assertj.core.api.Assertions;
 
-public class Hooks {
+/**
+ * @author letsrokk (Dmitry Mayer).
+ */
+public class HookSteps {
+
+    @Before("@WithHooks")
+    public void beforeHook(){
+        // nothing
+    }
+
+    @After("@WithHooks")
+    public void afterHook(){
+        // nothing
+    }
+
+    @Before("@BeforeHookWithException")
+    public void beforeHookWithException(){
+        Assertions.fail("Exception in Hook step");
+    }
+
+    @After("@AfterHookWithException")
+    public void afterHookWithException(){
+        Assertions.fail("Exception in Hook step");
+    }
 
     @Before("@bp")
     public void beforePassed() {
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
new file mode 100644
index 000000000..db1279635
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm.samples;
+
+import io.cucumber.java.PendingException;
+import io.cucumber.java.en.Given;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class PendingSteps {
+
+    @Given("^step is yet to be implemented$")
+    public void stepIsYetToBeImplemented() throws Throwable {
+        // Write code here that turns the phrase above into concrete actions
+        throw new PendingException();
+    }
+
+}
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..c769404ef
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/SimpleFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
similarity index 72%
rename from allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/SimpleFeatureSteps.java
rename to allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
index ac5bf7c9d..ffa41cb13 100644
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,13 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm.samples;
+package io.qameta.allure.cucumber6jvm.samples;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -47,7 +46,10 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        assertEquals(this.c, arg1);
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
     }
 
 }
diff --git a/allure-cucumber3-jvm/src/test/resources/allure.properties b/allure-cucumber6-jvm/src/test/resources/allure.properties
similarity index 100%
rename from allure-cucumber3-jvm/src/test/resources/allure.properties
rename to allure-cucumber6-jvm/src/test/resources/allure.properties
diff --git a/allure-cucumber6-jvm/src/test/resources/features/ambigious.feature b/allure-cucumber6-jvm/src/test/resources/features/ambigious.feature
new file mode 100644
index 000000000..921223a39
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/ambigious.feature
@@ -0,0 +1,5 @@
+Feature: Feature with ambigious steps
+
+  Scenario: Simple scenario with ambigious steps
+    When ambigious step present
+    Then something bad should happen
diff --git a/allure-cucumber-jvm/src/test/resources/features/attachments.feature b/allure-cucumber6-jvm/src/test/resources/features/attachments.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/attachments.feature
rename to allure-cucumber6-jvm/src/test/resources/features/attachments.feature
diff --git a/allure-cucumber-jvm/src/test/resources/features/background.feature b/allure-cucumber6-jvm/src/test/resources/features/background.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/background.feature
rename to allure-cucumber6-jvm/src/test/resources/features/background.feature
diff --git a/allure-cucumber-jvm/src/test/resources/features/broken.feature b/allure-cucumber6-jvm/src/test/resources/features/broken.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/broken.feature
rename to allure-cucumber6-jvm/src/test/resources/features/broken.feature
diff --git a/allure-cucumber-jvm/src/test/resources/features/datatable.feature b/allure-cucumber6-jvm/src/test/resources/features/datatable.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/datatable.feature
rename to allure-cucumber6-jvm/src/test/resources/features/datatable.feature
diff --git a/allure-cucumber-jvm/src/test/resources/features/description.feature b/allure-cucumber6-jvm/src/test/resources/features/description.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/description.feature
rename to allure-cucumber6-jvm/src/test/resources/features/description.feature
diff --git a/allure-cucumber-jvm/src/test/resources/features/examples.feature b/allure-cucumber6-jvm/src/test/resources/features/examples.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/examples.feature
rename to allure-cucumber6-jvm/src/test/resources/features/examples.feature
diff --git a/allure-cucumber-jvm/src/test/resources/features/failed.feature b/allure-cucumber6-jvm/src/test/resources/features/failed.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/failed.feature
rename to allure-cucumber6-jvm/src/test/resources/features/failed.feature
diff --git a/allure-cucumber2-jvm/src/test/resources/features/hooks.feature b/allure-cucumber6-jvm/src/test/resources/features/hooks.feature
similarity index 73%
rename from allure-cucumber2-jvm/src/test/resources/features/hooks.feature
rename to allure-cucumber6-jvm/src/test/resources/features/hooks.feature
index 7f8fdf16e..aca3f5b1b 100644
--- a/allure-cucumber2-jvm/src/test/resources/features/hooks.feature
+++ b/allure-cucumber6-jvm/src/test/resources/features/hooks.feature
@@ -1,4 +1,25 @@
-Feature: Hooks variations
+Feature: Scenarios with hooks
+
+  @WithHooks
+  Scenario: Simple scenario with Before and After hooks
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @BeforeHookWithException
+  Scenario: Simple scenario with Before hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @AfterHookWithException
+  Scenario: Simple scenario with After hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
 
   @bp @af @bp_sf_af
   Scenario: Scenario with good before and bad after but failed
diff --git a/allure-cucumber3-jvm/src/test/resources/features/multi-examples.feature b/allure-cucumber6-jvm/src/test/resources/features/multi-examples.feature
similarity index 86%
rename from allure-cucumber3-jvm/src/test/resources/features/multi-examples.feature
rename to allure-cucumber6-jvm/src/test/resources/features/multi-examples.feature
index c83e923db..04fb2cfef 100644
--- a/allure-cucumber3-jvm/src/test/resources/features/multi-examples.feature
+++ b/allure-cucumber6-jvm/src/test/resources/features/multi-examples.feature
@@ -1,4 +1,4 @@
-Feature: Test Scenarios with multiple Examples
+Feature: Test Scenarios with  multiple Examples
 
   Scenario Outline: Scenario with Multiple Examples
     Given a is <a>
diff --git a/allure-cucumber6-jvm/src/test/resources/features/parallel.feature b/allure-cucumber6-jvm/src/test/resources/features/parallel.feature
new file mode 100644
index 000000000..a99d46839
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/parallel.feature
@@ -0,0 +1,17 @@
+Feature: Parallel execution of pickles
+
+  Scenario Outline: Simple scenario outline with examples
+    Given a is <a>
+    And b is <b>
+    When I add a to b
+    Then result is <result>
+    Examples:
+      | a | b | result |
+      | 1 | 3 | 4      |
+      | 2 | 4 | 6      |
+
+  Scenario: Simple scenario
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
diff --git a/allure-cucumber6-jvm/src/test/resources/features/pending.feature b/allure-cucumber6-jvm/src/test/resources/features/pending.feature
new file mode 100644
index 000000000..5ad9c3438
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/pending.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with Pending steps
+
+  Scenario: Step is not implemented
+    Given a is 5
+    When step is yet to be implemented
+    Then b is 10
diff --git a/allure-cucumber6-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber6-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-cucumber3-jvm/src/test/resources/features/simple.feature b/allure-cucumber6-jvm/src/test/resources/features/same/simple.feature
similarity index 100%
rename from allure-cucumber3-jvm/src/test/resources/features/simple.feature
rename to allure-cucumber6-jvm/src/test/resources/features/same/simple.feature
diff --git a/allure-cucumber3-jvm/src/test/resources/features/description.feature b/allure-cucumber6-jvm/src/test/resources/features/scenario_description.feature
similarity index 85%
rename from allure-cucumber3-jvm/src/test/resources/features/description.feature
rename to allure-cucumber6-jvm/src/test/resources/features/scenario_description.feature
index 935b6731a..fe49efe31 100644
--- a/allure-cucumber3-jvm/src/test/resources/features/description.feature
+++ b/allure-cucumber6-jvm/src/test/resources/features/scenario_description.feature
@@ -4,12 +4,14 @@ This is description for current feature.
 It should appear on each scenario in report
 
   Scenario: Add a to b (1)
+    scenario description 1
     Given a is 5
     And b is 10
     When I add a to b
     Then result is 15
 
   Scenario: Add a to b (2)
+    scenario description 2
     Given a is 1
     And b is 2
     When I add a to b
diff --git a/allure-cucumber3-jvm/src/test/resources/features/failed.feature b/allure-cucumber6-jvm/src/test/resources/features/simple.feature
similarity index 81%
rename from allure-cucumber3-jvm/src/test/resources/features/failed.feature
rename to allure-cucumber6-jvm/src/test/resources/features/simple.feature
index a70f8ec79..c5b5f2b5f 100644
--- a/allure-cucumber3-jvm/src/test/resources/features/failed.feature
+++ b/allure-cucumber6-jvm/src/test/resources/features/simple.feature
@@ -4,4 +4,4 @@ Feature: Simple feature
     Given a is 5
     And b is 10
     When I add a to b
-    Then result is 123
+    Then result is 15
diff --git a/allure-cucumber-jvm/src/test/resources/features/tags.feature b/allure-cucumber6-jvm/src/test/resources/features/tags.feature
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/features/tags.feature
rename to allure-cucumber6-jvm/src/test/resources/features/tags.feature
diff --git a/allure-cucumber6-jvm/src/test/resources/features/undefined.feature b/allure-cucumber6-jvm/src/test/resources/features/undefined.feature
new file mode 100644
index 000000000..39475ff7d
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/undefined.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with undefined steps
+
+  Scenario: Step is not defined
+    Given  a is 5
+    When step is undefined
+    Then b is 10
diff --git a/allure-cucumber2-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts
similarity index 53%
rename from allure-cucumber2-jvm/build.gradle.kts
rename to allure-cucumber7-jvm/build.gradle.kts
index 3201d1c25..55e1a88fc 100644
--- a/allure-cucumber2-jvm/build.gradle.kts
+++ b/allure-cucumber7-jvm/build.gradle.kts
@@ -1,19 +1,21 @@
-description = "Allure CucumberJVM 2.0 Integration"
+description = "Allure CucumberJVM 7.0"
 
-val agent: Configuration by configurations.creating
-
-val cucumberVersion = "2.4.0"
+val cucumberVersion = "7.18.1"
+val cucumberGherkinVersion = "28.0.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("io.cucumber:cucumber-core:$cucumberVersion")
-    implementation("io.cucumber:cucumber-java:$cucumberVersion")
+    compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
+    compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("commons-io:commons-io")
+    testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
@@ -21,15 +23,14 @@ dependencies {
 
 tasks.jar {
     manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.cucumber2jvm"
-        ))
+        attributes(
+            mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.cucumber7jvm"
+            )
+        )
     }
 }
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
new file mode 100644
index 000000000..cbb3e7246
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -0,0 +1,457 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm;
+
+import io.cucumber.messages.types.Examples;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.messages.types.Scenario;
+import io.cucumber.messages.types.TableCell;
+import io.cucumber.messages.types.TableRow;
+import io.cucumber.plugin.ConcurrentEventListener;
+import io.cucumber.plugin.event.DataTableArgument;
+import io.cucumber.plugin.event.EmbedEvent;
+import io.cucumber.plugin.event.EventHandler;
+import io.cucumber.plugin.event.EventPublisher;
+import io.cucumber.plugin.event.HookTestStep;
+import io.cucumber.plugin.event.HookType;
+import io.cucumber.plugin.event.PickleStepTestStep;
+import io.cucumber.plugin.event.Result;
+import io.cucumber.plugin.event.Step;
+import io.cucumber.plugin.event.StepArgument;
+import io.cucumber.plugin.event.TestCase;
+import io.cucumber.plugin.event.TestCaseFinished;
+import io.cucumber.plugin.event.TestCaseStarted;
+import io.cucumber.plugin.event.TestSourceRead;
+import io.cucumber.plugin.event.TestStepFinished;
+import io.cucumber.plugin.event.TestStepStarted;
+import io.cucumber.plugin.event.WriteEvent;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.cucumber7jvm.testsourcemodel.TestSourcesModelProxy;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static io.qameta.allure.util.ResultsUtils.md5;
+
+/**
+ * Allure plugin for Cucumber JVM 7.0.
+ */
+@SuppressWarnings({
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+})
+public class AllureCucumber7Jvm implements ConcurrentEventListener {
+
+    private static final String COLON = ":";
+
+    private final AllureLifecycle lifecycle;
+
+    private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
+
+    private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
+    private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
+    private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
+    private final EventHandler<TestStepStarted> stepStartedHandler = this::handleTestStepStarted;
+    private final EventHandler<TestStepFinished> stepFinishedHandler = this::handleTestStepFinished;
+    private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
+    private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
+
+    private final Map<UUID, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+
+    private static final String TXT_EXTENSION = ".txt";
+    private static final String TEXT_PLAIN = "text/plain";
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
+
+    @SuppressWarnings("unused")
+    public AllureCucumber7Jvm() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureCucumber7Jvm(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void setEventPublisher(final EventPublisher publisher) {
+        publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
+
+        publisher.registerHandlerFor(TestCaseStarted.class, caseStartedHandler);
+        publisher.registerHandlerFor(TestCaseFinished.class, caseFinishedHandler);
+
+        publisher.registerHandlerFor(TestStepStarted.class, stepStartedHandler);
+        publisher.registerHandlerFor(TestStepFinished.class, stepFinishedHandler);
+
+        publisher.registerHandlerFor(WriteEvent.class, writeEventHandler);
+        publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
+    }
+
+    private void handleFeatureStartedHandler(final TestSourceRead event) {
+        testSources.addTestSourceReadEvent(event.getUri(), event);
+    }
+
+    private void handleTestCaseStarted(final TestCaseStarted event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+
+        final Deque<String> tags = new LinkedList<>(testCase.getTags());
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
+
+        final String name = testCase.getName();
+
+
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(testCase),
+                testCase.getLocation().getLine()
+        );
+
+        final String testCaseUuid = testCase.getId().toString();
+
+        final TestResult result = new TestResult()
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(fullName)
+                .setName(name)
+                .setLabels(labelBuilder.getScenarioLabels())
+                .setLinks(labelBuilder.getScenarioLinks());
+
+        final Scenario scenarioDefinition =
+                testSources.getScenarioDefinition(
+                        testCase.getUri(),
+                        testCase.getLocation().getLine()
+                );
+
+        if (scenarioDefinition.getExamples() != null) {
+            result.setParameters(
+                    getExamplesAsParameters(scenarioDefinition, testCase)
+            );
+        }
+
+        final String description = Stream.of(feature.getDescription(), scenarioDefinition.getDescription())
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.joining("\n"));
+
+        if (!description.isEmpty()) {
+            result.setDescription(description);
+        }
+
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestCase(testCaseUuid);
+    }
+
+    private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final String uuid = testCase.getId().toString();
+        final Result result = event.getResult();
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
+
+        lifecycle.stopTestCase(uuid);
+        lifecycle.writeTestCase(uuid);
+    }
+
+    private void handleTestStepStarted(final TestStepStarted event) {
+        final TestCase testCase = event.getTestCase();
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.getTestStep());
+        }
+    }
+
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCase.getId().toString();
+        final Step step = pickleStep.getStep();
+
+        final StepResult stepResult = new StepResult()
+                .setName(step.getKeyword() + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, pickleStep.getId().toString(), stepResult);
+
+        final StepArgument stepArgument = step.getArgument();
+        if (stepArgument instanceof DataTableArgument) {
+            final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+            createDataTableAttachment(dataTableArgument);
+        }
+    }
+
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+        final StepResult stepResult = new StepResult()
+                .setName(hook.getCodeLocation())
+                .setStart(System.currentTimeMillis());
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, hook.getId().toString(), stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+
+        final UUID hookId = hook.getId();
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hookId, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = hookId.toString();
+        if (hook.getHookType() == HookType.BEFORE) {
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
+        } else {
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
+        }
+    }
+
+    private void handleTestStepFinished(final TestStepFinished event) {
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.getResult(), hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.getResult(), hook.getId());
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
+            handleStopStep(event.getTestCase(), event.getResult(), pickleStep.getId());
+        }
+    }
+
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == HookType.BEFORE || hook.getHookType() == HookType.AFTER;
+    }
+
+    private void handleWriteEvent(final WriteEvent event) {
+        lifecycle.addAttachment(
+                "Text output",
+                TEXT_PLAIN,
+                TXT_EXTENSION,
+                Objects.toString(event.getText()).getBytes(StandardCharsets.UTF_8)
+        );
+    }
+
+    private void handleEmbedEvent(final EmbedEvent event) {
+        lifecycle.addAttachment(event.name, event.getMediaType(), null, new ByteArrayInputStream(event.getData()));
+    }
+
+    private String getHistoryId(final TestCase testCase) {
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLocation().getLine();
+        return md5(testCaseLocation);
+    }
+
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
+    }
+
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
+    }
+
+    private Status translateTestCaseStatus(final Result testCaseResult) {
+        switch (testCaseResult.getStatus()) {
+            case FAILED:
+                return getStatus(testCaseResult.getError())
+                        .orElse(Status.FAILED);
+            case PASSED:
+                return Status.PASSED;
+            case SKIPPED:
+            case PENDING:
+                return Status.SKIPPED;
+            case AMBIGUOUS:
+            case UNDEFINED:
+            default:
+                return null;
+        }
+    }
+
+    private List<Parameter> getExamplesAsParameters(
+            final Scenario scenario,
+            final TestCase localCurrentTestCase) {
+
+        final Optional<Examples> maybeExample =
+                scenario.getExamples().stream()
+                        .filter(example -> example.getTableBody().stream()
+                                .anyMatch(row -> row.getLocation().getLine()
+                                                 == localCurrentTestCase.getLocation().getLine())
+                        )
+                        .findFirst();
+
+        if (!maybeExample.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBody().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLocation().getLine())
+                .findFirst();
+
+        if (!maybeRow.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final TableRow row = maybeRow.get();
+        final int size = row.getCells().size();
+
+        final List<String> headerNames = examples.getTableHeader()
+                .map(TableRow::getCells)
+                .map(rows -> rows.stream()
+                        .map(TableCell::getValue)
+                        .collect(Collectors.toList())
+                )
+                .orElse(null);
+
+        return IntStream.range(0, size)
+                .mapToObj(index -> {
+                    final String name = Objects.nonNull(headerNames)
+                            ? headerNames.get(index)
+                            : "arg" + index;
+                    final String value = row.getCells().get(index).getValue();
+                    return createParameter(name, value);
+                })
+                .collect(Collectors.toList());
+    }
+
+    private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
+        final List<List<String>> rowsInTable = dataTableArgument.cells();
+        final StringBuilder dataTableCsv = new StringBuilder();
+        for (List<String> columns : rowsInTable) {
+            if (!columns.isEmpty()) {
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                dataTableCsv.append(rowValue);
+            }
+        }
+        final String attachmentSource = lifecycle
+                .prepareAttachment("Data table", "text/tab-separated-values", "csv");
+        lifecycle.writeAttachment(attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+    }
+
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook.getId());
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
+        }
+
+        final String uuid = hook.getId().toString();
+
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopFixture(uuid);
+
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
+    }
+
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final UUID stepId) {
+        final Feature feature = testSources.getFeature(testCase.getUri());
+
+        final Status stepStatus = translateTestCaseStatus(eventResult);
+
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        final String stepUuid = stepId.toString();
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
+    }
+}
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
similarity index 54%
rename from allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java
rename to allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
index b222a988a..03585b090 100644
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,42 +13,42 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm;
+package io.qameta.allure.cucumber7jvm;
 
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.plugin.event.TestCase;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
+import io.qameta.allure.util.ResultsUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
 import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
 import static io.qameta.allure.util.ResultsUtils.createHostLabel;
-import static io.qameta.allure.util.ResultsUtils.createIssueLink;
+import static io.qameta.allure.util.ResultsUtils.createLabel;
 import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
-import static io.qameta.allure.util.ResultsUtils.createLink;
-import static io.qameta.allure.util.ResultsUtils.createPackageLabel;
-import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
 import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
 import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
-import static io.qameta.allure.util.ResultsUtils.createTagLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
-import static io.qameta.allure.util.ResultsUtils.createTmsLink;
 
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -57,24 +57,20 @@ class LabelBuilder {
     private static final String ISSUE_LINK = "@ISSUE";
     private static final String TMS_LINK = "@TMSLINK";
     private static final String PLAIN_LINK = "@LINK";
+    private static final String OWNER = "@OWNER";
 
     private final List<Label> scenarioLabels = new ArrayList<>();
     private final List<Link> scenarioLinks = new ArrayList<>();
 
-    LabelBuilder(final Feature feature, final TestCase scenario, final Deque<PickleTag> tags) {
+    LabelBuilder(final Feature feature, final TestCase scenario, final Deque<String> tags) {
         final TagParser tagParser = new TagParser(feature, scenario);
 
-        getScenarioLabels().add(createFeatureLabel(feature.getName()));
-        getScenarioLabels().add(createStoryLabel(scenario.getName()));
-
         while (tags.peek() != null) {
-            final PickleTag tag = tags.remove();
-
-            final String tagString = tag.getName();
+            final String tag = tags.remove();
 
-            if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
+            if (tag.contains(COMPOSITE_TAG_DELIMITER)) {
 
-                final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
+                final String[] tagParts = tag.split(COMPOSITE_TAG_DELIMITER, 2);
                 if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
                     // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
                     continue;
@@ -85,44 +81,57 @@ class LabelBuilder {
 
                 // Handle composite named links
                 if (tagKey.startsWith(PLAIN_LINK + ".")) {
-                    tryHandleNamedLink(tagString);
+                    tryHandleNamedLink(tag);
                     continue;
                 }
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
+                        break;
+                    case OWNER:
+                        scenarioLabels.add(ResultsUtils.createOwnerLabel(tagValue));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(createSeverityLabel(tagString.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tag.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
-        getScenarioLabels().addAll(Arrays.asList(
+        final String featureName = feature.getName();
+        final URI uri = scenario.getUri();
+
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
-                createPackageLabel(feature.getName()),
-                createSuiteLabel(feature.getName()),
+                createFeatureLabel(featureName),
+                createStoryLabel(scenario.getName()),
+                createSuiteLabel(featureName),
                 createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber2jvm"),
-                createLanguageLabel("java")
+                createFrameworkLabel("cucumber4jvm"),
+                createLanguageLabel("java"),
+                createLabel("gherkin_uri", uri.toString())
         ));
+
+        featurePackage(uri.toString(), featureName)
+                .map(ResultsUtils::createPackageLabel)
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -133,8 +142,8 @@ public List<Link> getScenarioLinks() {
         return scenarioLinks;
     }
 
-    private Label getTagLabel(final PickleTag tag) {
-        return createTagLabel(tag.getName().substring(1));
+    private Label getTagLabel(final String tag) {
+        return ResultsUtils.createTagLabel(tag.substring(1));
     }
 
     /**
@@ -143,17 +152,45 @@ private Label getTagLabel(final PickleTag tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
-            LOGGER.warn("Composite named tag {} is not matches regex {}. skipping", tagString,
+            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
         }
     }
 
+    private Optional<String> featurePackage(final String uriString, final String featureName) {
+        final Optional<URI> maybeUri = safeUri(uriString);
+        if (!maybeUri.isPresent()) {
+            return Optional.empty();
+        }
+        URI uri = maybeUri.get();
+
+        if (!uri.isOpaque()) {
+            final URI work = new File("").toURI();
+            uri = work.relativize(uri);
+        }
+        final String schemeSpecificPart = uri.normalize().getSchemeSpecificPart();
+        final Stream<String> folders = Stream.of(schemeSpecificPart.replaceAll("\\.", "_").split("/"));
+        final Stream<String> name = Stream.of(featureName);
+        return Optional.of(Stream.concat(folders, name)
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.joining(".")));
+    }
+
+    private static Optional<URI> safeUri(final String uri) {
+        try {
+            return Optional.of(URI.create(uri));
+        } catch (Exception e) {
+            LOGGER.debug("could not parse feature uri {}", uri, e);
+        }
+        return Optional.empty();
+    }
 }
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/TagParser.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
similarity index 62%
rename from allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/TagParser.java
rename to allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
index 55b6c40cb..a20ad07bf 100644
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/TagParser.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm;
+package io.qameta.allure.cucumber7jvm;
 
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.plugin.event.TestCase;
 import io.qameta.allure.SeverityLevel;
 
 import java.util.Arrays;
@@ -38,35 +37,35 @@ class TagParser {
         this.scenario = scenario;
     }
 
-    protected boolean isFlaky() {
+    public boolean isFlaky() {
         return getStatusDetailByTag(FLAKY);
     }
 
-    protected boolean isMuted() {
+    public boolean isMuted() {
         return getStatusDetailByTag(MUTED);
     }
 
-    protected boolean isKnown() {
+    public boolean isKnown() {
         return getStatusDetailByTag(KNOWN);
     }
 
-    protected boolean getStatusDetailByTag(final String tagName) {
+    private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+               || feature.getTags().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
-    protected boolean isResultTag(final PickleTag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
-                .contains(tag.getName().toUpperCase());
+    public boolean isResultTag(final String tag) {
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
+                .contains(tag.toUpperCase());
     }
 
-    protected boolean isPureSeverityTag(final PickleTag tag) {
+    public boolean isPureSeverityTag(final String tag) {
         return Arrays.stream(SeverityLevel.values())
                 .map(SeverityLevel::value)
                 .map(value -> "@" + value)
-                .anyMatch(value -> value.equalsIgnoreCase(tag.getName()));
+                .anyMatch(value -> value.equalsIgnoreCase(tag));
     }
 
 }
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
new file mode 100644
index 000000000..8b3533d65
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
@@ -0,0 +1,178 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm.testsourcemodel;
+
+import io.cucumber.gherkin.GherkinParser;
+import io.cucumber.messages.types.Background;
+import io.cucumber.messages.types.Envelope;
+import io.cucumber.messages.types.Examples;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.messages.types.FeatureChild;
+import io.cucumber.messages.types.GherkinDocument;
+import io.cucumber.messages.types.RuleChild;
+import io.cucumber.messages.types.Scenario;
+import io.cucumber.messages.types.Source;
+import io.cucumber.messages.types.SourceMediaType;
+import io.cucumber.messages.types.Step;
+import io.cucumber.messages.types.TableRow;
+import io.cucumber.plugin.event.TestSourceRead;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+final class TestSourcesModel {
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final Map<URI, GherkinDocument> pathToAstMap = new HashMap<>();
+    private final Map<URI, Map<Long, AstNode>> pathToNodeMap = new HashMap<>();
+
+    public static Scenario getScenarioDefinition(final AstNode astNode) {
+        AstNode candidate = astNode;
+        while (candidate != null && !(candidate.node instanceof Scenario)) {
+            candidate = candidate.parent;
+        }
+        return candidate == null ? null : (Scenario) candidate.node;
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        pathToReadEventMap.put(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        if (!pathToAstMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToAstMap.containsKey(path)) {
+            return pathToAstMap.get(path).getFeature().orElse(null);
+        }
+        return null;
+    }
+
+    private void parseGherkinSource(final URI path) {
+        if (!pathToReadEventMap.containsKey(path)) {
+            return;
+        }
+        final String source = pathToReadEventMap.get(path).getSource();
+
+        final GherkinParser parser = GherkinParser.builder()
+                .build();
+
+        final Stream<Envelope> envelopes = parser.parse(
+                Envelope.of(new Source(path.toString(), source, SourceMediaType.TEXT_X_CUCUMBER_GHERKIN_PLAIN)));
+
+        // TODO: What about empty gherkin docs?
+        final GherkinDocument gherkinDocument = envelopes
+                .map(Envelope::getGherkinDocument)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findFirst()
+                .orElse(null);
+
+        pathToAstMap.put(path, gherkinDocument);
+        final Map<Long, AstNode> nodeMap = new HashMap<>();
+
+        // TODO: What about gherkin docs with no features?
+        final Feature feature = gherkinDocument.getFeature().get();
+        final AstNode currentParent = new AstNode(feature, null);
+        for (FeatureChild child : feature.getChildren()) {
+            processFeatureDefinition(nodeMap, child, currentParent);
+        }
+        pathToNodeMap.put(path, nodeMap);
+
+    }
+
+    private void processFeatureDefinition(
+            final Map<Long, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
+        child.getBackground().ifPresent(background -> processBackgroundDefinition(nodeMap, background, currentParent));
+        child.getScenario().ifPresent(scenario -> processScenarioDefinition(nodeMap, scenario, currentParent));
+        child.getRule().ifPresent(rule -> {
+            final AstNode childNode = new AstNode(rule, currentParent);
+            nodeMap.put(rule.getLocation().getLine(), childNode);
+            rule.getChildren().forEach(ruleChild -> processRuleDefinition(nodeMap, ruleChild, childNode));
+        });
+    }
+
+    private void processBackgroundDefinition(
+            final Map<Long, AstNode> nodeMap, final Background background, final AstNode currentParent
+    ) {
+        final AstNode childNode = createAstNode(background, currentParent);
+        nodeMap.put(background.getLocation().getLine(), childNode);
+        for (Step step : background.getSteps()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
+        }
+    }
+
+    private void processScenarioDefinition(
+            final Map<Long, AstNode> nodeMap, final Scenario child, final AstNode currentParent) {
+        final AstNode childNode = createAstNode(child, currentParent);
+        nodeMap.put(child.getLocation().getLine(), childNode);
+        for (Step step : child.getSteps()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
+        }
+        if (!child.getExamples().isEmpty()) {
+            processScenarioOutlineExamples(nodeMap, child, childNode);
+        }
+    }
+
+    private void processRuleDefinition(
+            final Map<Long, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
+        child.getBackground().ifPresent(background -> processBackgroundDefinition(nodeMap, background, currentParent));
+        child.getScenario().ifPresent(scenario -> processScenarioDefinition(nodeMap, scenario, currentParent));
+    }
+
+    private void processScenarioOutlineExamples(
+            final Map<Long, AstNode> nodeMap, final Scenario scenarioOutline, final AstNode parent
+    ) {
+        for (Examples examples : scenarioOutline.getExamples()) {
+            final AstNode examplesNode = createAstNode(examples, parent);
+            // TODO: Can tables without headers even exist?
+            final TableRow headerRow = examples.getTableHeader().get();
+            final AstNode headerNode = createAstNode(headerRow, examplesNode);
+            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
+            for (int i = 0; i < examples.getTableBody().size(); ++i) {
+                final TableRow examplesRow = examples.getTableBody().get(i);
+                final AstNode expandedScenarioNode = createAstNode(examplesRow, examplesNode);
+                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
+            }
+        }
+    }
+
+    public AstNode getAstNode(final URI path, final int line) {
+        if (!pathToNodeMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToNodeMap.containsKey(path)) {
+            return pathToNodeMap.get(path).get((long) line);
+        }
+        return null;
+    }
+
+    private AstNode createAstNode(final Object node, final AstNode astNode) {
+        return new AstNode(node, astNode);
+    }
+
+    private static class AstNode {
+        private final Object node;
+        private final AstNode parent;
+
+        AstNode(final Object node, final AstNode parent) {
+            this.node = node;
+            this.parent = parent;
+        }
+    }
+}
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
new file mode 100644
index 000000000..1ceacf741
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -0,0 +1,76 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm.testsourcemodel;
+
+import io.cucumber.gherkin.GherkinDialect;
+import io.cucumber.gherkin.GherkinDialectProvider;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.messages.types.Scenario;
+import io.cucumber.plugin.event.TestSourceRead;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class TestSourcesModelProxy {
+
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final TestSourcesModel testSources;
+
+    public TestSourcesModelProxy() {
+        this.testSources = new TestSourcesModel();
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        this.pathToReadEventMap.put(path, event);
+        testSources.addTestSourceReadEvent(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        return testSources.getFeature(path);
+    }
+
+    public Scenario getScenarioDefinition(final URI path, final int line) {
+        return TestSourcesModel.getScenarioDefinition(testSources.getAstNode(path, line));
+    }
+
+    public String getKeywordFromSource(final URI uri, final int stepLine) {
+        return this.getKeywordFromSourceInternal(uri, stepLine);
+    }
+
+    private String getKeywordFromSourceInternal(final URI uri, final int stepLine) {
+        final Feature feature = getFeature(uri);
+        if (feature != null) {
+            final TestSourceRead event = this.getTestSourceReadEvent(uri);
+            final String trimmedSourceLine = Objects.requireNonNull(event).getSource().split("\n")[stepLine - 1].trim();
+            final GherkinDialect dialect = new GherkinDialectProvider(feature.getLanguage()).getDefaultDialect();
+            for (String keyword : dialect.getStepKeywords()) {
+                if (trimmedSourceLine.startsWith(keyword)) {
+                    return keyword;
+                }
+            }
+        }
+        return "";
+    }
+
+    private TestSourceRead getTestSourceReadEvent(final URI uri) {
+        if (this.pathToReadEventMap.containsKey(uri)) {
+            return pathToReadEventMap.get(uri);
+        }
+        return null;
+    }
+}
diff --git a/allure-cucumber7-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber7-jvm/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
new file mode 100644
index 000000000..45da3d019
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -0,0 +1,819 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm;
+
+import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.core.feature.FeatureParser;
+import io.cucumber.core.feature.FeatureWithLines;
+import io.cucumber.core.options.CommandlineOptionsParser;
+import io.cucumber.core.options.RuntimeOptions;
+import io.cucumber.core.resource.ClassLoaders;
+import io.cucumber.core.runtime.FeaturePathFeatureSupplier;
+import io.cucumber.core.runtime.Runtime;
+import io.cucumber.core.runtime.TimeServiceEventBus;
+import io.github.glytching.junit.extension.system.SystemProperty;
+import io.github.glytching.junit.extension.system.SystemPropertyExtension;
+import io.qameta.allure.Step;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Clock;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.md5;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
+import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class AllureCucumber7JvmTest {
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSetName() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder("Add a to b");
+    }
+
+    @AllureFeatures.PassedTests
+    @Test
+    void shouldSetStatus() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetFailedStatus() {
+        final AllureResults results = runFeature("features/failed.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.FAILED);
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetStatusDetails() {
+        final AllureResults results = runFeature("features/failed.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatusDetails)
+                .extracting(StatusDetails::getMessage)
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldSetBrokenStatus() {
+        final AllureResults results = runFeature("features/broken.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.BROKEN);
+    }
+
+    @AllureFeatures.Stages
+    @Test
+    void shouldSetStage() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStage)
+                .containsExactlyInAnyOrder(Stage.FINISHED);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runFeature("features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runFeature("features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.FullName
+    @Test
+    void shouldSetFullName() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getFullName)
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetDescription() {
+        final AllureResults results = runFeature("features/description.feature");
+
+        final String expected = "This is description for current feature.\n"
+                                + "It should appear on each scenario in report";
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected,
+                        expected
+                );
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetScenarioDescription() {
+        final AllureResults results = runFeature("features/scenario_description.feature");
+
+        final String expected = "This is description for current feature.\n"
+                                + "It should appear on each scenario in report";
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected + "\n    scenario description 1",
+                        expected + "\n    scenario description 2"
+                );
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAddDataTableAttachment() {
+        final AllureResults results = runFeature("features/datatable.feature");
+
+        final List<Attachment> attachments = results.getTestResults().stream()
+                .map(TestResult::getSteps)
+                .flatMap(Collection::stream)
+                .map(StepResult::getAttachments)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+
+        assertThat(attachments)
+                .extracting(Attachment::getName, Attachment::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("Data table", "text/tab-separated-values")
+                );
+
+        final Attachment dataTableAttachment = attachments.iterator().next();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
+        assertThat(attachmentFiles)
+                .containsKeys(dataTableAttachment.getSource());
+
+        final byte[] bytes = attachmentFiles.get(dataTableAttachment.getSource());
+        final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
+
+        assertThat(attachmentContent)
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
+                );
+
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAddAttachments() {
+        final AllureResults results = runFeature("features/attachments.feature");
+
+        final List<Attachment> attachments = results.getTestResults().stream()
+                .map(TestResult::getSteps)
+                .flatMap(Collection::stream)
+                .map(StepResult::getAttachments)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+
+        assertThat(attachments)
+                .extracting(Attachment::getName, Attachment::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("TextAttachment", "text/plain"),
+                        tuple("ImageAttachment", "image/png")
+                );
+
+        final List<String> attachmentContents = results.getAttachments().values().stream()
+                .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
+                .collect(Collectors.toList());
+
+        assertThat(attachmentContents)
+                .containsExactlyInAnyOrder("text attachment", "image attachment");
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldAddBackgroundSteps() {
+        final AllureResults results = runFeature("features/background.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
+                );
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldAddParametersFromExamples() {
+        final AllureResults results = runFeature("features/examples.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2);
+
+        assertThat(testResults.get(0).getParameters())
+                .hasSize(3);
+
+        assertThat(testResults.get(1).getParameters())
+                .hasSize(3);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldHandleMultipleExamplesPerOutline() {
+        final AllureResults results = runFeature("features/multi-examples.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldSupportTaggedExamplesBlocks() {
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("tag", "ExamplesTag2")
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddTags() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("tag", "FeatureTag"),
+                        tuple("tag", "good")
+                );
+    }
+
+    @AllureFeatures.Links
+    @ExtendWith(SystemPropertyExtension.class)
+    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
+    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @Test
+    void shouldAddLinks() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getType, Link::getUrl)
+                .contains(
+                        tuple("OAT-4444", "tms", "https://example.org/tms/OAT-4444"),
+                        tuple("BUG-22400", "issue", "https://example.org/issue/BUG-22400")
+                );
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddBddLabels() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("feature", "Test Simple Scenarios"),
+                        tuple("story", "Add a to b")
+                );
+    }
+
+    @AllureFeatures.Timeline
+    @Test
+    void shouldAddThreadHostLabels() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName)
+                .contains("host", "thread");
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddCommonLabels() {
+        final AllureResults results = runFeature("features/tags.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple(PACKAGE_LABEL_NAME, "src.test.resources.features.tags_feature.Test Simple Scenarios"),
+                        tuple(SUITE_LABEL_NAME, "Test Simple Scenarios"),
+                        tuple(TEST_CLASS_LABEL_NAME, "Add a to b")
+                );
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessUndefinedSteps() {
+        final AllureResults results = runFeature("features/undefined.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
+                );
+    }
+
+    @AllureFeatures.SkippedTests
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessPendingExceptionsInSteps() {
+        final AllureResults results = runFeature("features/pending.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.SKIPPED);
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
+                );
+    }
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForSimpleFeatures() {
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("And b is 10", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForHooks() {
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHook()", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
+                );
+
+        assertThat(tr1.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults.get(0).getHistoryId())
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getHistoryId)
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
+
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
+
+    @AllureFeatures.Parallel
+    @Test
+    void shouldProcessScenariosInParallelMode() {
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsSubsequence(
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsSubsequence(
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsSubsequence(
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Stages
+    @Test
+    void shouldDisplayHooksAsStages() {
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
+
+        assertThat(tr1.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHook()", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
+                );
+
+        assertThat(tr2.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
+                );
+
+
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
+                );
+
+        assertThat(tr3.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
+                );
+
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldHandleAmbigiousStepsExceptions() {
+        final AllureResults results = runFeature("features/ambigious.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Simple scenario with ambigious steps", null)
+                );
+
+        assertThat(testResults.get(0).getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
+                );
+    }
+
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm7-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("x-provided", "cucumberjvm7-test-provided")
+                );
+    }
+
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
+                );
+    }
+
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
+            final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber7jvm.samples",
+                    "--no-summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser(System.out)
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+            final FeatureParser parser = new FeatureParser(bus::generateId);
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber7jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
+    }
+
+}
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
new file mode 100644
index 000000000..2358228cd
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
@@ -0,0 +1,40 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm.samples;
+
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AmbigiousSteps {
+
+    @When("^ambigious step (.+)$")
+    public void ambigious_1() {
+        // nothing here
+    }
+
+    @When("^ambigious step ([a-z]+)$")
+    public void ambigious_2() {
+        // nothing here
+    }
+
+    @Then("^something bad should happen")
+    public void somethingBadStep(){
+        //nothing here
+    }
+}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/AttachmentSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
similarity index 59%
rename from allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/AttachmentSteps.java
rename to allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
index 1e583cc25..0c8d10141 100644
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,31 +13,27 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm.samples;
+package io.qameta.allure.cucumber7jvm.samples;
 
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
+import io.cucumber.java.Scenario;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Given;
 
-public class AttachmentSteps
-{
+public class AttachmentSteps {
     private Scenario scenario;
 
     @Before("@attachments")
-    public void setup(Scenario scenario)
-    {
+    public void setup(Scenario scenario) {
         this.scenario = scenario;
     }
 
     @Given("step with scenario write")
-    public void stepWithScenarioWrite()
-    {
-        scenario.write("text attachment");
+    public void stepWithScenarioWrite() {
+        scenario.attach("text attachment".getBytes(), "text/plain", "TextAttachment");
     }
 
     @Given("step with scenario embed")
-    public void stepWithScenarioEmbed()
-    {
-        scenario.embed("image attachment".getBytes(), "image/png");
+    public void stepWithScenarioEmbed() {
+        scenario.attach("image attachment".getBytes(), "image/png", "ImageAttachment");
     }
 }
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
similarity index 82%
rename from allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BackgroundFeatureSteps.java
rename to allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
index a5f7236a5..f1a6f01f5 100644
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm.samples;
+package io.qameta.allure.cucumber7jvm.samples;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BrokenFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
similarity index 86%
rename from allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BrokenFeatureSteps.java
rename to allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
index 7b0bade00..206f927f7 100644
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm.samples;
+package io.qameta.allure.cucumber7jvm.samples;
 
-import cucumber.api.java.en.Given;
+import io.cucumber.java.en.Given;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/DatatableFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
similarity index 82%
rename from allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/DatatableFeatureSteps.java
rename to allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
index 1a98bdce3..30e7e406e 100644
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumberjvm.samples;
+package io.qameta.allure.cucumber7jvm.samples;
 
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
+import io.cucumber.datatable.DataTable;
+import io.cucumber.java.en.Given;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/Hooks.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
similarity index 56%
rename from allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/Hooks.java
rename to allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
index c47628cba..072c7d810 100644
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/Hooks.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,12 +13,36 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm.samples;
+package io.qameta.allure.cucumber7jvm.samples;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import org.assertj.core.api.Assertions;
 
-public class Hooks {
+/**
+ * @author letsrokk (Dmitry Mayer).
+ */
+public class HookSteps {
+
+    @Before("@WithHooks")
+    public void beforeHook(){
+        // nothing
+    }
+
+    @After("@WithHooks")
+    public void afterHook(){
+        // nothing
+    }
+
+    @Before("@BeforeHookWithException")
+    public void beforeHookWithException(){
+        Assertions.fail("Exception in Hook step");
+    }
+
+    @After("@AfterHookWithException")
+    public void afterHookWithException(){
+        Assertions.fail("Exception in Hook step");
+    }
 
     @Before("@bp")
     public void beforePassed() {
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
new file mode 100644
index 000000000..c55390ed0
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm.samples;
+
+import io.cucumber.java.PendingException;
+import io.cucumber.java.en.Given;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class PendingSteps {
+
+    @Given("^step is yet to be implemented$")
+    public void stepIsYetToBeImplemented() {
+        // Write code here that turns the phrase above into concrete actions
+        throw new PendingException();
+    }
+
+}
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..0f66fa87c
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.cucumber.java.en.And;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/SimpleFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
similarity index 72%
rename from allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/SimpleFeatureSteps.java
rename to allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
index 894d6a852..9212f0318 100644
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,13 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm.samples;
+package io.qameta.allure.cucumber7jvm.samples;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -47,7 +46,10 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        assertEquals(this.c, arg1);
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
     }
 
 }
diff --git a/allure-cucumber7-jvm/src/test/resources/allure.properties b/allure-cucumber7-jvm/src/test/resources/allure.properties
new file mode 100644
index 000000000..dbfefee44
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.model.indentOutput=true
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
diff --git a/allure-cucumber7-jvm/src/test/resources/features/ambigious.feature b/allure-cucumber7-jvm/src/test/resources/features/ambigious.feature
new file mode 100644
index 000000000..921223a39
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/ambigious.feature
@@ -0,0 +1,5 @@
+Feature: Feature with ambigious steps
+
+  Scenario: Simple scenario with ambigious steps
+    When ambigious step present
+    Then something bad should happen
diff --git a/allure-cucumber2-jvm/src/test/resources/features/attachments.feature b/allure-cucumber7-jvm/src/test/resources/features/attachments.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/attachments.feature
rename to allure-cucumber7-jvm/src/test/resources/features/attachments.feature
diff --git a/allure-cucumber2-jvm/src/test/resources/features/background.feature b/allure-cucumber7-jvm/src/test/resources/features/background.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/background.feature
rename to allure-cucumber7-jvm/src/test/resources/features/background.feature
diff --git a/allure-cucumber2-jvm/src/test/resources/features/broken.feature b/allure-cucumber7-jvm/src/test/resources/features/broken.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/broken.feature
rename to allure-cucumber7-jvm/src/test/resources/features/broken.feature
diff --git a/allure-cucumber2-jvm/src/test/resources/features/datatable.feature b/allure-cucumber7-jvm/src/test/resources/features/datatable.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/datatable.feature
rename to allure-cucumber7-jvm/src/test/resources/features/datatable.feature
diff --git a/allure-cucumber2-jvm/src/test/resources/features/description.feature b/allure-cucumber7-jvm/src/test/resources/features/description.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/description.feature
rename to allure-cucumber7-jvm/src/test/resources/features/description.feature
diff --git a/allure-cucumber2-jvm/src/test/resources/features/examples.feature b/allure-cucumber7-jvm/src/test/resources/features/examples.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/examples.feature
rename to allure-cucumber7-jvm/src/test/resources/features/examples.feature
diff --git a/allure-cucumber2-jvm/src/test/resources/features/failed.feature b/allure-cucumber7-jvm/src/test/resources/features/failed.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/failed.feature
rename to allure-cucumber7-jvm/src/test/resources/features/failed.feature
diff --git a/allure-cucumber3-jvm/src/test/resources/features/hooks.feature b/allure-cucumber7-jvm/src/test/resources/features/hooks.feature
similarity index 73%
rename from allure-cucumber3-jvm/src/test/resources/features/hooks.feature
rename to allure-cucumber7-jvm/src/test/resources/features/hooks.feature
index 7f8fdf16e..aca3f5b1b 100644
--- a/allure-cucumber3-jvm/src/test/resources/features/hooks.feature
+++ b/allure-cucumber7-jvm/src/test/resources/features/hooks.feature
@@ -1,4 +1,25 @@
-Feature: Hooks variations
+Feature: Scenarios with hooks
+
+  @WithHooks
+  Scenario: Simple scenario with Before and After hooks
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @BeforeHookWithException
+  Scenario: Simple scenario with Before hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @AfterHookWithException
+  Scenario: Simple scenario with After hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
 
   @bp @af @bp_sf_af
   Scenario: Scenario with good before and bad after but failed
diff --git a/allure-cucumber2-jvm/src/test/resources/features/multipleExamples.feature b/allure-cucumber7-jvm/src/test/resources/features/multi-examples.feature
similarity index 54%
rename from allure-cucumber2-jvm/src/test/resources/features/multipleExamples.feature
rename to allure-cucumber7-jvm/src/test/resources/features/multi-examples.feature
index a083f7502..04fb2cfef 100644
--- a/allure-cucumber2-jvm/src/test/resources/features/multipleExamples.feature
+++ b/allure-cucumber7-jvm/src/test/resources/features/multi-examples.feature
@@ -1,15 +1,17 @@
-Feature: Test Scenarios with multiple examples
+Feature: Test Scenarios with  multiple Examples
 
-  Scenario Outline: Scenario with Positive Examples
+  Scenario Outline: Scenario with Multiple Examples
     Given a is <a>
     And b is <b>
     When I add a to b
     Then result is <result>
 
+    @ExamplesTag1
     Examples:
       | a | b | result |
       | 1 | 3 | 4      |
 
+    @ExamplesTag2
     Examples:
       | a | b | result |
-      | 2 | 8 | 10     |
\ No newline at end of file
+      | 2 | 4 | 6      |
\ No newline at end of file
diff --git a/allure-cucumber7-jvm/src/test/resources/features/parallel.feature b/allure-cucumber7-jvm/src/test/resources/features/parallel.feature
new file mode 100644
index 000000000..a99d46839
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/parallel.feature
@@ -0,0 +1,17 @@
+Feature: Parallel execution of pickles
+
+  Scenario Outline: Simple scenario outline with examples
+    Given a is <a>
+    And b is <b>
+    When I add a to b
+    Then result is <result>
+    Examples:
+      | a | b | result |
+      | 1 | 3 | 4      |
+      | 2 | 4 | 6      |
+
+  Scenario: Simple scenario
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
diff --git a/allure-cucumber7-jvm/src/test/resources/features/pending.feature b/allure-cucumber7-jvm/src/test/resources/features/pending.feature
new file mode 100644
index 000000000..5ad9c3438
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/pending.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with Pending steps
+
+  Scenario: Step is not implemented
+    Given a is 5
+    When step is yet to be implemented
+    Then b is 10
diff --git a/allure-cucumber7-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber7-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-cucumber3-jvm/src/test/resources/features/tags.feature b/allure-cucumber7-jvm/src/test/resources/features/same/simple.feature
similarity index 51%
rename from allure-cucumber3-jvm/src/test/resources/features/tags.feature
rename to allure-cucumber7-jvm/src/test/resources/features/same/simple.feature
index 2632623ee..c5b5f2b5f 100644
--- a/allure-cucumber3-jvm/src/test/resources/features/tags.feature
+++ b/allure-cucumber7-jvm/src/test/resources/features/same/simple.feature
@@ -1,13 +1,7 @@
-@FeatureTag
-@tmsLink=OAT-4444
-@flaky
-@issue=BUG-22400
-Feature: Test Simple Scenarios
+Feature: Simple feature
 
-  @good
   Scenario: Add a to b
     Given a is 5
     And b is 10
     When I add a to b
     Then result is 15
-
diff --git a/allure-cucumber7-jvm/src/test/resources/features/scenario_description.feature b/allure-cucumber7-jvm/src/test/resources/features/scenario_description.feature
new file mode 100644
index 000000000..fe49efe31
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/scenario_description.feature
@@ -0,0 +1,19 @@
+Feature: Descriptions feature
+
+This is description for current feature.
+It should appear on each scenario in report
+
+  Scenario: Add a to b (1)
+    scenario description 1
+    Given a is 5
+    And b is 10
+    When I add a to b
+    Then result is 15
+
+  Scenario: Add a to b (2)
+    scenario description 2
+    Given a is 1
+    And b is 2
+    When I add a to b
+    Then result is 3
+
diff --git a/allure-cucumber7-jvm/src/test/resources/features/simple.feature b/allure-cucumber7-jvm/src/test/resources/features/simple.feature
new file mode 100644
index 000000000..c5b5f2b5f
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/simple.feature
@@ -0,0 +1,7 @@
+Feature: Simple feature
+
+  Scenario: Add a to b
+    Given a is 5
+    And b is 10
+    When I add a to b
+    Then result is 15
diff --git a/allure-cucumber2-jvm/src/test/resources/features/tags.feature b/allure-cucumber7-jvm/src/test/resources/features/tags.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/tags.feature
rename to allure-cucumber7-jvm/src/test/resources/features/tags.feature
diff --git a/allure-cucumber7-jvm/src/test/resources/features/undefined.feature b/allure-cucumber7-jvm/src/test/resources/features/undefined.feature
new file mode 100644
index 000000000..39475ff7d
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/undefined.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with undefined steps
+
+  Scenario: Step is not defined
+    Given  a is 5
+    When step is undefined
+    Then b is 10
diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts
index 8735dc765..4862cfc18 100644
--- a/allure-descriptions-javadoc/build.gradle.kts
+++ b/allure-descriptions-javadoc/build.gradle.kts
@@ -3,13 +3,11 @@ description = "Allure Javadoc Descriptions"
 val agent: Configuration by configurations.creating
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
-    api("commons-io:commons-io")
-    api(project(":allure-java-commons"))
     testImplementation("com.google.testing.compile:compile-testing")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
@@ -18,15 +16,14 @@ dependencies {
 
 tasks.jar {
     manifest {
-        attributes(mapOf(
+        attributes(
+            mapOf(
                 "Automatic-Module-Name" to "io.qameta.allure.description"
-        ))
+            )
+        )
     }
 }
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
new file mode 100644
index 000000000..5bdaf305c
--- /dev/null
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
@@ -0,0 +1,28 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.description;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+final class ClassNames {
+
+    static final String DESCRIPTION_ANNOTATION = "io.qameta.allure.Description";
+
+    private ClassNames() {
+        throw new IllegalStateException("do not instance");
+    }
+}
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index 747071fe2..320ffe841 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,38 +15,42 @@
  */
 package io.qameta.allure.description;
 
-import io.qameta.allure.Description;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import java.io.IOException;
 import java.io.Writer;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static io.qameta.allure.util.ResultsUtils.generateMethodSignatureHash;
+import static io.qameta.allure.description.ClassNames.DESCRIPTION_ANNOTATION;
 
 /**
  * @author Egor Borisov ehborisov@gmail.com
  */
-@SupportedAnnotationTypes("io.qameta.allure.Description")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes(DESCRIPTION_ANNOTATION)
 public class JavaDocDescriptionsProcessor extends AbstractProcessor {
 
+    private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
+
     private Filer filer;
     private Elements elementUtils;
     private Messager messager;
@@ -60,28 +64,39 @@ public synchronized void init(final ProcessingEnvironment env) {
         messager = env.getMessager();
     }
 
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latest();
+    }
+
     @Override
     public boolean process(final Set<? extends TypeElement> annotations, final RoundEnvironment env) {
-        final Set<? extends Element> elements = env.getElementsAnnotatedWith(Description.class);
-        elements.forEach(el -> {
-            if (!el.getAnnotation(Description.class).useJavaDoc()) {
+        final TypeElement typeElement = elementUtils.getTypeElement(DESCRIPTION_ANNOTATION);
+        final Set<? extends Element> elements = env.getElementsAnnotatedWith(typeElement);
+        final Set<ExecutableElement> methods = ElementFilter.methodsIn(elements);
+        methods.forEach(method -> {
+            final String rawDocs = elementUtils.getDocComment(method);
+
+            if (rawDocs == null) {
                 return;
             }
-            final String docs = elementUtils.getDocComment(el);
-            final List<String> typeParams = ((ExecutableElement) el).getParameters().stream()
-                    .map(param -> param.asType().toString()).collect(Collectors.toList());
-            final String name = el.getSimpleName().toString();
-            if (docs == null) {
-                messager.printMessage(Diagnostic.Kind.WARNING,
-                        "Unable to create resource for method " + name + typeParams
-                                + " as it does not have a docs comment");
+
+            final String docs = rawDocs.trim();
+            if (docs.isEmpty()) {
                 return;
             }
 
-            final String hash = generateMethodSignatureHash(el.getEnclosingElement().toString(), name, typeParams);
+            final String name = method.getSimpleName().toString();
+            final List<String> typeParams = method.getParameters().stream()
+                    .map(this::methodParameterTypeMapper)
+                    .collect(Collectors.toList());
+
+            final String hash = generateMethodSignatureHash(
+                    method.getEnclosingElement().toString(), name, typeParams
+            );
             try {
-                final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT,
-                        "allureDescriptions", hash);
+                final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "",
+                        ALLURE_DESCRIPTIONS_FOLDER + hash);
                 try (Writer writer = file.openWriter()) {
                     writer.write(docs);
                 }
@@ -93,4 +108,34 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
 
         return true;
     }
+
+    private String methodParameterTypeMapper(final VariableElement parameter) {
+        final Element typeElement = processingEnv.getTypeUtils().asElement(parameter.asType());
+        return typeElement != null ? typeElement.toString() : parameter.asType().toString();
+    }
+
+    private static String generateMethodSignatureHash(final String className,
+                                                      final String methodName,
+                                                      final List<String> parameterTypes) {
+        final MessageDigest md = getMd5Digest();
+        md.update(className.getBytes(StandardCharsets.UTF_8));
+        md.update(methodName.getBytes(StandardCharsets.UTF_8));
+        parameterTypes.stream()
+                .map(string -> string.getBytes(StandardCharsets.UTF_8))
+                .forEach(md::update);
+        final byte[] bytes = md.digest();
+        return bytesToHex(bytes);
+    }
+
+    private static MessageDigest getMd5Digest() {
+        try {
+            return MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException("Can not find hashing algorithm", e);
+        }
+    }
+
+    private static String bytesToHex(final byte[] bytes) {
+        return new BigInteger(1, bytes).toString(16);
+    }
 }
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index 2cb881af9..4b3b5fc90 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,13 +31,13 @@
  */
 class ProcessDescriptionsTest {
 
-    private static final String ALLURE_PACKAGE_NAME = "allureDescriptions";
+    private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
 
     @Test
     void captureDescriptionTest() {
         final String expectedMethodSignatureHash = "4e7f896021ef2fce7c1deb7f5b9e38fb";
 
-        JavaFileObject source = JavaFileObjects.forSourceLines(
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
                 "io.qameta.allure.description.test.DescriptionSample",
                 "package io.qameta.allure.description.test;",
                 "import io.qameta.allure.Description;",
@@ -53,18 +53,55 @@ void captureDescriptionTest() {
                 "}"
         );
 
-        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
-        Compilation compilation = compiler.compile(source);
-        assertThat(compilation).generatedFile(
-                StandardLocation.CLASS_OUTPUT,
-                ALLURE_PACKAGE_NAME,
-                expectedMethodSignatureHash
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
+                .withOptions("-Werror");
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation)
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .isEqualTo("Captured javadoc description");
+    }
+
+    @Test
+    void captureDescriptionTestIfNoUseJavadocIsSpecified() {
+        final String expectedMethodSignatureHash = "4e7f896021ef2fce7c1deb7f5b9e38fb";
+
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
+                "",
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* Captured javadoc description",
+                "*/",
+                "@Description",
+                "public void sampleTest() {",
+                "}",
+                "}"
         );
+
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
+                .withOptions("-Werror");
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation)
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .contains("Captured javadoc description");
     }
 
     @Test
     void skipUncommentedMethodTest() {
-        JavaFileObject source = JavaFileObjects.forSourceLines(
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
                 "io.qameta.allure.description.test.DescriptionSample",
                 "package io.qameta.allure.description.test;",
                 "import io.qameta.allure.Description;",
@@ -77,11 +114,84 @@ void skipUncommentedMethodTest() {
                 "}"
         );
 
-        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
-        Compilation compilation = compiler.compile(source);
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        final Compilation compilation = compiler.compile(source);
         assertThat(compilation).succeeded();
+    }
+
+    @Test
+    void captureDescriptionParametrizedTestWithGenericParameterTest() {
+        final String expectedMethodSignatureHash = "e90e26691bf14511db819d78624ba716";
+
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
+                "import org.junit.jupiter.params.ParameterizedTest;",
+                "import org.junit.jupiter.params.provider.MethodSource;",
+                "import java.util.Arrays;",
+                "import java.util.List;",
+                "import java.util.stream.Stream;",
+                "",
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* Captured javadoc description",
+                "*/",
+                "@ParameterizedTest",
+                "@MethodSource(\"provideStringListParameters\")",
+                "@Description(useJavaDoc = true)",
+                "public void sampleParametrizedTestWithGenericParameterAndJavadocComment(List<String> stringList) {",
+                "}",
+                "",
+                "private static Stream<List<String>> provideStringListParameters() {",
+                "return Stream.of(Arrays.asList(\"foo\", \"bar\"));",
+                "}",
+                "}"
+        );
+
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation).generatedFile(
+                StandardLocation.CLASS_OUTPUT,
+                "",
+                ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+        );
+    }
+
+    @Test
+    void captureDescriptionParametrizedTestWithPrimitivesParameterTest() {
+        final String expectedMethodSignatureHash = "edeeeaa02f01218cc206e0c6ff024c7a";
+
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
+                "import org.junit.jupiter.params.ParameterizedTest;",
+                "import org.junit.jupiter.params.provider.ValueSource;",
+                "",
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* Captured javadoc description",
+                "*/",
+                "@ParameterizedTest",
+                "@ValueSource(ints = {1, 2, 3})",
+                "@Description(useJavaDoc = true)",
+                "public void sampleParametrizedTestWithPrimitivesParameterAndJavadocComment(int someIntValue) {",
+                "}",
+                "}"
+        );
+
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        final Compilation compilation = compiler.compile(source);
         assertThat(compilation)
-                .hadWarningContaining("Unable to create resource for method "
-                        + "sampleTestWithoutJavadocComment[] as it does not have a docs comment");
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .isEqualTo("Captured javadoc description");
     }
 }
diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
new file mode 100644
index 000000000..2f3cc642d
--- /dev/null
+++ b/allure-grpc/build.gradle.kts
@@ -0,0 +1,77 @@
+import com.google.protobuf.gradle.*
+
+plugins {
+    id("com.google.protobuf")
+}
+
+description = "Allure gRPC Integration"
+
+val agent: Configuration by configurations.creating
+
+val grpcVersion = "1.77.0"
+val protobufVersion = "4.33.2"
+val jacksonVersion = "2.17.2"
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    api(project(":allure-attachments"))
+    compileOnly("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
+    compileOnly("com.google.protobuf:protobuf-java-util:$protobufVersion")
+    compileOnly("io.grpc:grpc-api:$grpcVersion")
+    testImplementation("com.google.protobuf:protobuf-java-util:$protobufVersion")
+    testImplementation("com.google.protobuf:protobuf-java:$protobufVersion")
+    testImplementation("io.grpc:grpc-core:$grpcVersion")
+    testImplementation("io.grpc:grpc-netty-shaded:$grpcVersion")
+    testImplementation("io.grpc:grpc-protobuf:$grpcVersion")
+    testImplementation("io.grpc:grpc-stub:$grpcVersion")
+    testImplementation("javax.annotation:javax.annotation-api")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.grpcmock:grpcmock-junit5")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.grpc"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
+
+sourceSets {
+    test {
+        java {
+            srcDir("build/generated/source/proto/test")
+            srcDir("src/test/java")
+        }
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
+    }
+    plugins {
+        id("grpc") {
+            artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion"
+        }
+    }
+    generateProtoTasks {
+        ofSourceSet("test").forEach {
+            it.plugins {
+                id("grpc")
+            }
+        }
+    }
+}
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
new file mode 100644
index 000000000..6518f5341
--- /dev/null
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -0,0 +1,483 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.grpc;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.MessageOrBuilder;
+import com.google.protobuf.util.JsonFormat;
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Allure interceptor logger for gRPC.
+ *
+ * @author dtuchs (Dmitry Tuchs).
+ */
+@SuppressWarnings({
+    "checkstyle:ClassFanOutComplexity",
+    "checkstyle:AnonInnerLength",
+    "checkstyle:JavaNCSS"
+})
+public class AllureGrpc implements ClientInterceptor {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureGrpc.class);
+    private static final String UNKNOWN = "unknown";
+    private static final String JSON_SUFFIX = " (json)";
+    private static final JsonFormat.Printer GRPC_TO_JSON_PRINTER = JsonFormat.printer();
+
+    private final AllureLifecycle lifecycle;
+    private final boolean markStepFailedOnNonZeroCode;
+    private final boolean interceptResponseMetadata;
+    private final String requestTemplatePath;
+    private final String responseTemplatePath;
+
+    public AllureGrpc() {
+        this(Allure.getLifecycle(), true, false,
+            "grpc-request.ftl", "grpc-response.ftl");
+    }
+
+    public AllureGrpc(
+        final AllureLifecycle lifecycle,
+        final boolean markStepFailedOnNonZeroCode,
+        final boolean interceptResponseMetadata,
+        final String requestTemplatePath,
+        final String responseTemplatePath
+    ) {
+        this.lifecycle = lifecycle;
+        this.markStepFailedOnNonZeroCode = markStepFailedOnNonZeroCode;
+        this.interceptResponseMetadata = interceptResponseMetadata;
+        this.requestTemplatePath = requestTemplatePath;
+        this.responseTemplatePath = responseTemplatePath;
+    }
+
+    @Override
+    public <T, R> ClientCall<T, R> interceptCall(
+        final MethodDescriptor<T, R> methodDescriptor,
+        final CallOptions callOptions,
+        final Channel nextChannel
+    ) {
+        final AllureLifecycle current = lifecycle;
+        final String parent = current.getCurrentTestCaseOrStep().orElse(null);
+        final String stepUuid = UUID.randomUUID().toString();
+        final List<String> clientMessages = new ArrayList<>();
+        final List<String> serverMessages = new ArrayList<>();
+        final Map<String, String> initialHeaders = new LinkedHashMap<>();
+        final Map<String, String> trailers = new LinkedHashMap<>();
+
+        final String stepName = buildStepName(nextChannel, methodDescriptor);
+        if (parent != null) {
+            current.startStep(parent, stepUuid, new StepResult().setName(stepName));
+        } else {
+            current.startStep(stepUuid, new StepResult().setName(stepName));
+        }
+
+        final StepContext<T, R> stepContext = new StepContext<>(
+            stepUuid, methodDescriptor, current, clientMessages,
+            serverMessages, initialHeaders, trailers
+        );
+
+        return new ForwardingClientCall.SimpleForwardingClientCall<T, R>(
+            nextChannel.newCall(methodDescriptor, callOptions)
+        ) {
+            @Override
+            public void start(final Listener<R> responseListener, final Metadata requestHeaders) {
+                final Listener<R> forwardingListener = new ForwardingClientCallListener<R>() {
+                    @Override
+                    protected Listener<R> delegate() {
+                        return responseListener;
+                    }
+
+                    @Override
+                    public void onHeaders(final Metadata headers) {
+                        handleHeaders(headers, stepContext.getInitialHeaders());
+                        super.onHeaders(headers);
+                    }
+
+                    @Override
+                    public void onMessage(final R message) {
+                        handleServerMessage(message, stepContext.getServerMessages());
+                        super.onMessage(message);
+                    }
+
+                    @Override
+                    public void onClose(final io.grpc.Status status, final Metadata responseTrailers) {
+                        handleClose(status, responseTrailers, stepContext);
+                        super.onClose(status, responseTrailers);
+                    }
+                };
+                super.start(forwardingListener, requestHeaders);
+            }
+
+            @Override
+            public void sendMessage(final T message) {
+                handleClientMessage(message, stepContext.getClientMessages());
+                super.sendMessage(message);
+            }
+        };
+    }
+
+    private void addRawJsonAttachment(
+        final String stepUuid,
+        final String attachmentName,
+        final String jsonBody,
+        final AllureLifecycle lifecycle
+    ) {
+        if (jsonBody == null || jsonBody.isEmpty()) {
+            return;
+        }
+        final String source = UUID.randomUUID() + ".json";
+        lifecycle.updateStep(stepUuid, step -> step.getAttachments().add(
+            new Attachment()
+                .setName(attachmentName)
+                .setSource(source)
+                .setType("application/json")
+        ));
+        lifecycle.writeAttachment(
+            source,
+            new ByteArrayInputStream(jsonBody.getBytes(StandardCharsets.UTF_8))
+        );
+    }
+
+    private void handleClose(
+        final io.grpc.Status status,
+        final Metadata responseTrailers,
+        final StepContext<?, ?> stepContext
+    ) {
+        try {
+            if (interceptResponseMetadata && responseTrailers != null) {
+                copyAsciiResponseMetadata(responseTrailers, stepContext.getTrailers());
+            }
+            attachRequestIfPresent(
+                stepContext.getStepUuid(),
+                stepContext.getMethodDescriptor(),
+                stepContext.getClientMessages(),
+                stepContext.getLifecycle()
+            );
+            attachResponse(
+                stepContext.getStepUuid(),
+                stepContext.getServerMessages(),
+                status,
+                stepContext.getInitialHeaders(),
+                stepContext.getTrailers(),
+                stepContext.getLifecycle()
+            );
+            stepContext.getLifecycle().updateStep(
+                stepContext.getStepUuid(),
+                step -> step.setStatus(convertStatus(status))
+            );
+        } catch (Throwable throwable) {
+            LOGGER.error("Failed to finalize Allure step for gRPC call", throwable);
+            stepContext.getLifecycle().updateStep(
+                stepContext.getStepUuid(),
+                step -> step.setStatus(Status.BROKEN)
+            );
+        } finally {
+            stopStepSafely(stepContext.getLifecycle(), stepContext.getStepUuid());
+        }
+    }
+
+    private void handleHeaders(final Metadata headers, final Map<String, String> destination) {
+        try {
+            if (interceptResponseMetadata && headers != null) {
+                copyAsciiResponseMetadata(headers, destination);
+            }
+        } catch (Throwable throwable) {
+            LOGGER.warn("Failed to capture response headers", throwable);
+        }
+    }
+
+    private <T> void handleClientMessage(final T message, final List<String> destination) {
+        try {
+            destination.add(GRPC_TO_JSON_PRINTER.print((MessageOrBuilder) message));
+        } catch (InvalidProtocolBufferException e) {
+            LOGGER.error("Could not serialize gRPC request message to JSON", e);
+        } catch (Throwable throwable) {
+            LOGGER.error("Unexpected error while serializing gRPC request message", throwable);
+        }
+    }
+
+    private <R> void handleServerMessage(final R message, final List<String> destination) {
+        try {
+            destination.add(GRPC_TO_JSON_PRINTER.print((MessageOrBuilder) message));
+        } catch (InvalidProtocolBufferException e) {
+            LOGGER.error("Could not serialize gRPC response message to JSON", e);
+        } catch (Throwable throwable) {
+            LOGGER.error("Unexpected error while serializing gRPC response message", throwable);
+        }
+    }
+
+    private <T, R> void attachRequestIfPresent(
+        final String stepUuid,
+        final MethodDescriptor<T, R> methodDescriptor,
+        final List<String> clientMessages,
+        final AllureLifecycle lifecycle
+    ) {
+        final String body = toJsonBody(clientMessages);
+        if (body == null) {
+            return;
+        }
+        final String name = clientMessages.size() > 1
+            ? "gRPC request (collection of elements from Client stream)"
+            : "gRPC request";
+        final GrpcRequestAttachment requestAttachment = GrpcRequestAttachment.Builder
+            .create(name, methodDescriptor.getFullMethodName())
+            .setBody(body)
+            .build();
+
+        addRenderedAttachmentToStep(
+            stepUuid,
+            requestAttachment.getName(),
+            requestAttachment,
+            requestTemplatePath,
+            lifecycle
+        );
+        addRawJsonAttachment(stepUuid, name + JSON_SUFFIX, body, lifecycle);
+    }
+
+    private void attachResponse(
+        final String stepUuid,
+        final List<String> serverMessages,
+        final io.grpc.Status status,
+        final Map<String, String> initialHeaders,
+        final Map<String, String> trailers,
+        final AllureLifecycle lifecycle
+    ) {
+        final String body = toJsonBody(serverMessages);
+        final String name = serverMessages.size() > 1
+            ? "gRPC response (collection of elements from Server stream)"
+            : "gRPC response";
+
+        final Map<String, String> metadata = new LinkedHashMap<>();
+        if (interceptResponseMetadata) {
+            metadata.putAll(initialHeaders);
+            metadata.putAll(trailers);
+        }
+
+        final GrpcResponseAttachment.Builder builder = GrpcResponseAttachment.Builder
+            .create(name)
+            .setStatus(status.toString());
+
+        if (body != null) {
+            builder.setBody(body);
+        }
+        if (!metadata.isEmpty()) {
+            builder.addMetadata(metadata);
+        }
+
+        final GrpcResponseAttachment responseAttachment = builder.build();
+        addRenderedAttachmentToStep(
+            stepUuid,
+            responseAttachment.getName(),
+            responseAttachment,
+            responseTemplatePath,
+            lifecycle
+        );
+        if (body != null) {
+            addRawJsonAttachment(stepUuid, name + JSON_SUFFIX, body, lifecycle);
+        }
+    }
+
+    private void stopStepSafely(final AllureLifecycle lifecycle, final String stepUuid) {
+        try {
+            lifecycle.stopStep(stepUuid);
+        } catch (Throwable throwable) {
+            LOGGER.warn("Failed to stop Allure step {}", stepUuid, throwable);
+        }
+    }
+
+    private Status convertStatus(final io.grpc.Status grpcStatus) {
+        if (grpcStatus.isOk() || !markStepFailedOnNonZeroCode) {
+            return Status.PASSED;
+        }
+        return Status.FAILED;
+    }
+
+    private static String buildStepName(
+        final Channel channel,
+        final MethodDescriptor<?, ?> methodDescriptor
+    ) {
+        final String authority = channel != null ? channel.authority() : null;
+        final String safeAuthority = authority != null ? authority : UNKNOWN;
+        final String type = toSnakeCase(methodDescriptor.getType());
+        return "Send " + type + " gRPC request to "
+            + safeAuthority + "/" + methodDescriptor.getFullMethodName();
+    }
+
+    private static String toSnakeCase(final MethodDescriptor.MethodType methodType) {
+        if (methodType == null) {
+            return UNKNOWN;
+        }
+        return methodType.name().toLowerCase(Locale.ROOT);
+    }
+
+    private void addRenderedAttachmentToStep(
+        final String stepUuid,
+        final String attachmentName,
+        final AttachmentData data,
+        final String templatePath,
+        final AllureLifecycle lifecycle
+    ) {
+        final AttachmentRenderer<AttachmentData> renderer =
+            new FreemarkerAttachmentRenderer(templatePath);
+        final io.qameta.allure.attachment.AttachmentContent content;
+        try {
+            content = renderer.render(data);
+        } catch (Throwable throwable) {
+            LOGGER.warn(
+                "Could not render attachment '{}' using template '{}'",
+                attachmentName, templatePath, throwable
+            );
+            return;
+        }
+        if (content == null || content.getContent() == null) {
+            LOGGER.warn("Rendered attachment '{}' is empty; skipping", attachmentName);
+            return;
+        }
+        String fileExtension = content.getFileExtension();
+        if (fileExtension == null || fileExtension.isEmpty()) {
+            fileExtension = ".html";
+        }
+        final String source = UUID.randomUUID() + fileExtension;
+        lifecycle.updateStep(
+            stepUuid,
+            step -> step.getAttachments().add(
+                new Attachment()
+                    .setName(attachmentName)
+                    .setSource(source)
+                    .setType(
+                        content.getContentType() != null
+                            ? content.getContentType()
+                            : "text/html"
+                    )
+            )
+        );
+        lifecycle.writeAttachment(
+            source,
+            new ByteArrayInputStream(content.getContent().getBytes(StandardCharsets.UTF_8))
+        );
+    }
+
+    private static String toJsonBody(final List<String> items) {
+        if (items == null || items.isEmpty()) {
+            return null;
+        }
+        if (items.size() == 1) {
+            return items.get(0);
+        }
+        final String joined = String.join(",\n", items);
+        return "[" + joined + "]";
+    }
+
+    private static void copyAsciiResponseMetadata(
+        final Metadata source,
+        final Map<String, String> target
+    ) {
+        for (String key : source.keys()) {
+            if (key == null) {
+                continue;
+            }
+            if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
+                continue;
+            }
+            final Metadata.Key<String> keyAscii =
+                Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+            final String value = source.get(keyAscii);
+            if (value != null) {
+                target.put(key, value);
+            }
+        }
+    }
+
+    private static final class StepContext<T, R> {
+        private final String stepUuid;
+        private final MethodDescriptor<T, R> methodDescriptor;
+        private final AllureLifecycle lifecycle;
+        private final List<String> clientMessages;
+        private final List<String> serverMessages;
+        private final Map<String, String> initialHeaders;
+        private final Map<String, String> trailers;
+
+        StepContext(
+            final String stepUuid,
+            final MethodDescriptor<T, R> methodDescriptor,
+            final AllureLifecycle lifecycle,
+            final List<String> clientMessages,
+            final List<String> serverMessages,
+            final Map<String, String> initialHeaders,
+            final Map<String, String> trailers
+        ) {
+            this.stepUuid = stepUuid;
+            this.methodDescriptor = methodDescriptor;
+            this.lifecycle = lifecycle;
+            this.clientMessages = clientMessages;
+            this.serverMessages = serverMessages;
+            this.initialHeaders = initialHeaders;
+            this.trailers = trailers;
+        }
+
+        String getStepUuid() {
+            return stepUuid;
+        }
+
+        MethodDescriptor<T, R> getMethodDescriptor() {
+            return methodDescriptor;
+        }
+
+        AllureLifecycle getLifecycle() {
+            return lifecycle;
+        }
+
+        List<String> getClientMessages() {
+            return clientMessages;
+        }
+
+        List<String> getServerMessages() {
+            return serverMessages;
+        }
+
+        Map<String, String> getInitialHeaders() {
+            return initialHeaders;
+        }
+
+        Map<String, String> getTrailers() {
+            return trailers;
+        }
+    }
+}
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
new file mode 100644
index 000000000..4d05ead6d
--- /dev/null
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
@@ -0,0 +1,79 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.grpc;
+
+import io.qameta.allure.attachment.AttachmentData;
+
+import java.util.Objects;
+
+public class GrpcRequestAttachment implements AttachmentData {
+
+    private final String name;
+    private final String url;
+    private final String body;
+
+    public GrpcRequestAttachment(final String name, final String url, final String body) {
+        this.name = name;
+        this.url = url;
+        this.body = body;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Builder for GrpcRequestAttachment.
+     */
+    static final class Builder {
+
+        private final String name;
+
+        private final String url;
+
+        private String body;
+
+        private Builder(final String name, final String url) {
+            Objects.requireNonNull(name, "Name must not be null value");
+            Objects.requireNonNull(url, "Url must not be null value");
+            this.name = name;
+            this.url = url;
+        }
+
+        public static Builder create(final String attachmentName, final String url) {
+            return new Builder(attachmentName, url);
+        }
+
+        public Builder setBody(final String body) {
+            Objects.requireNonNull(body, "Body should not be null value");
+            this.body = body;
+            return this;
+        }
+
+        public GrpcRequestAttachment build() {
+            return new GrpcRequestAttachment(name, url, body);
+        }
+    }
+}
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
new file mode 100644
index 000000000..15d4629ec
--- /dev/null
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
@@ -0,0 +1,106 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.grpc;
+
+import io.qameta.allure.attachment.AttachmentData;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class GrpcResponseAttachment implements AttachmentData {
+
+    private final String name;
+    private final String body;
+    private final String status;
+    private final Map<String, String> metadata;
+
+    public GrpcResponseAttachment(final String name,
+                                  final String body,
+                                  final String status,
+                                  final Map<String, String> metadata) {
+        this.name = name;
+        this.body = body;
+        this.status = status;
+        this.metadata = metadata;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Builder for GrpcResponseAttachment.
+     */
+    static final class Builder {
+
+        private final String name;
+        private final Map<String, String> metadata = new HashMap<>();
+        private String body;
+        private String status;
+
+        private Builder(final String name) {
+            Objects.requireNonNull(name, "Name must not be null value");
+            this.name = name;
+        }
+
+        public static Builder create(final String attachmentName) {
+            return new Builder(attachmentName);
+        }
+
+        public Builder setBody(final String body) {
+            Objects.requireNonNull(body, "Body should not be null value");
+            this.body = body;
+            return this;
+        }
+
+        public Builder setStatus(final String status) {
+            Objects.requireNonNull(status, "Status should not be null value");
+            this.status = status;
+            return this;
+        }
+
+        public GrpcResponseAttachment.Builder setMetadata(final String key, final String value) {
+            Objects.requireNonNull(key, "Matadata key must not be null value");
+            Objects.requireNonNull(value, "Matadata value must not be null value");
+            this.metadata.put(key, value);
+            return this;
+        }
+
+        public GrpcResponseAttachment.Builder addMetadata(final Map<String, String> metadata) {
+            Objects.requireNonNull(metadata, "Metadata Map must not be null value");
+            this.metadata.putAll(metadata);
+            return this;
+        }
+
+        public GrpcResponseAttachment build() {
+            return new GrpcResponseAttachment(name, body, status, metadata);
+        }
+    }
+}
diff --git a/allure-grpc/src/main/resources/tpl/grpc-request.ftl b/allure-grpc/src/main/resources/tpl/grpc-request.ftl
new file mode 100644
index 000000000..7bab82e5e
--- /dev/null
+++ b/allure-grpc/src/main/resources/tpl/grpc-request.ftl
@@ -0,0 +1,33 @@
+<html>
+<#-- @ftlvariable name="data" type="io.qameta.allure.grpc.GrpcRequestAttachment" -->
+<head>
+    <meta http-equiv="content-type" content="text/html; charset = UTF-8">
+    <script src="https://yastatic.net/jquery/2.2.3/jquery.min.js" crossorigin="anonymous"></script>
+
+    <link href="https://yastatic.net/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+    <script src="https://yastatic.net/bootstrap/3.3.6/js/bootstrap.min.js" crossorigin="anonymous"></script>
+
+    <link type="text/css" href="https://yandex.st/highlightjs/8.0/styles/github.min.css" rel="stylesheet"/>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/languages/json.min.js"></script>
+    <script type="text/javascript">hljs.initHighlightingOnLoad();</script>
+
+    <style>
+        pre {
+            white-space: pre-wrap;
+        }
+    </style>
+</head>
+<body>
+<div>
+    <pre><code>gRPC: <#if data.url??>${data.url}<#else>Unknown</#if></code></pre>
+</div>
+
+<#if data.body??>
+    <h4>Request body</h4>
+    <div>
+        <pre><code>${data.body}</code></pre>
+    </div>
+</#if>
+</body>
+</html>
diff --git a/allure-grpc/src/main/resources/tpl/grpc-response.ftl b/allure-grpc/src/main/resources/tpl/grpc-response.ftl
new file mode 100644
index 000000000..48929888e
--- /dev/null
+++ b/allure-grpc/src/main/resources/tpl/grpc-response.ftl
@@ -0,0 +1,46 @@
+<html>
+<#-- @ftlvariable name="data" type="io.qameta.allure.grpc.GrpcResponseAttachment" -->
+<head>
+    <meta http-equiv="content-type" content="text/html; charset = UTF-8">
+    <script src="https://yastatic.net/jquery/2.2.3/jquery.min.js" crossorigin="anonymous"></script>
+
+    <link href="https://yastatic.net/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+    <script src="https://yastatic.net/bootstrap/3.3.6/js/bootstrap.min.js" crossorigin="anonymous"></script>
+
+    <link type="text/css" href="https://yandex.st/highlightjs/8.0/styles/github.min.css" rel="stylesheet"/>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/languages/json.min.js"></script>
+    <script type="text/javascript">hljs.initHighlightingOnLoad();</script>
+
+    <style>
+        pre {
+            white-space: pre-wrap;
+        }
+    </style>
+</head>
+<body>
+
+<div><h4>Status</h4>
+    <#if data.status??>
+        <pre><code><b>${data.status}</b></code></pre>
+    <#else>Unknown</#if>
+</div>
+
+<#if data.body??>
+    <h4>Response body</h4>
+    <div>
+        <pre><code>${data.body}</code></pre>
+    </div>
+</#if>
+
+<#if (data.metadata)?has_content>
+    <h4>Metadata</h4>
+    <div>
+        <#list data.metadata as key, value>
+            <div>${key}: ${value}</div>
+        </#list>
+    </div>
+</#if>
+
+</body>
+</html>
diff --git a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
new file mode 100644
index 000000000..e316fc75a
--- /dev/null
+++ b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
@@ -0,0 +1,381 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.grpc;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import io.grpc.stub.StreamObserver;
+import io.qameta.allure.Allure;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import org.grpcmock.GrpcMock;
+import org.grpcmock.junit5.GrpcMockExtension;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.grpcmock.GrpcMock.bidiStreamingMethod;
+import static org.grpcmock.GrpcMock.clientStreamingMethod;
+import static org.grpcmock.GrpcMock.serverStreamingMethod;
+import static org.grpcmock.GrpcMock.unaryMethod;
+
+@ExtendWith(GrpcMockExtension.class)
+class AllureGrpcTest {
+
+    private static final String RESPONSE_MESSAGE = "Hello world!";
+    private static final ObjectMapper JSON = new ObjectMapper();
+
+    private ManagedChannel managedChannel;
+
+    @BeforeEach
+    void configureMockServer() {
+        managedChannel = ManagedChannelBuilder
+            .forAddress("localhost", GrpcMock.getGlobalPort())
+            .usePlaintext()
+            .directExecutor()
+            .build();
+
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
+            .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()));
+
+        GrpcMock.stubFor(serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
+            .willReturn(asList(
+                Response.newBuilder().setMessage(RESPONSE_MESSAGE).build(),
+                Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()
+            )));
+
+        GrpcMock.stubFor(clientStreamingMethod(TestServiceGrpc.getCalculateClientStreamMethod())
+            .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()));
+
+        GrpcMock.stubFor(bidiStreamingMethod(TestServiceGrpc.getCalculateBidiStreamMethod())
+            .willProxyTo(responseObserver -> new StreamObserver<Request>() {
+                @Override
+                public void onNext(Request request) {
+                    responseObserver.onNext(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build());
+                }
+                @Override
+                public void onError(Throwable throwable) {
+                }
+                @Override
+                public void onCompleted() {
+                    responseObserver.onCompleted();
+                }
+            }));
+    }
+
+    @AfterEach
+    void shutdownChannel() {
+        Optional.ofNullable(managedChannel).ifPresent(ManagedChannel::shutdown);
+    }
+
+    @Test
+    void shouldCreateRequestAttachment() {
+        Request request = Request.newBuilder()
+            .setTopic("1")
+            .build();
+
+        Status errorStatus = Status.NOT_FOUND;
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod()).willReturn(errorStatus));
+
+        AllureResults allureResults = executeUnaryExpectingException(request);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps().get(0).getStatus())
+            .isEqualTo(io.qameta.allure.model.Status.FAILED);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC request", "gRPC response");
+    }
+
+    @Test
+    void shouldCreateResponseAttachment() {
+        Request request = Request.newBuilder()
+            .setTopic("1")
+            .build();
+
+        AllureResults allureResults = executeUnary(request);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC response");
+    }
+
+    @Test
+    void shouldCreateResponseAttachmentForServerStreamingResponse() {
+        Request request = Request.newBuilder()
+            .setTopic("1")
+            .build();
+
+        AllureResults allureResults = executeServerStreaming(request);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC response (collection of elements from Server stream)");
+    }
+
+    @Test
+    void shouldCreateResponseAttachmentOnStatusException() {
+        Status notFoundStatus = Status.NOT_FOUND;
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod()).willReturn(notFoundStatus));
+
+        Request request = Request.newBuilder()
+            .setTopic("2")
+            .build();
+
+        AllureResults allureResults = executeUnaryExpectingException(request);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps().get(0).getStatus())
+            .isEqualTo(io.qameta.allure.model.Status.FAILED);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC response");
+    }
+
+    @Test
+    void shouldCreateAttachmentsForClientStreamingWithAsynchronousStub() {
+        Request firstClientRequest = Request.newBuilder().setTopic("A").build();
+        Request secondClientRequest = Request.newBuilder().setTopic("B").build();
+
+        runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceStub asynchronousStub =
+                TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
+
+            final List<Response> receivedResponses = new ArrayList<Response>();
+
+            Allure.step("async-root-client-stream", () -> {
+                StreamObserver<Response> responseObserver = new StreamObserver<Response>() {
+                    @Override
+                    public void onNext(Response value) {
+                        receivedResponses.add(value);
+                    }
+                    @Override
+                    public void onError(Throwable throwable) {
+                    }
+                    @Override
+                    public void onCompleted() {
+                    }
+                };
+
+                StreamObserver<Request> requestObserver = asynchronousStub.calculateClientStream(responseObserver);
+                requestObserver.onNext(firstClientRequest);
+                requestObserver.onNext(secondClientRequest);
+                requestObserver.onCompleted();
+            });
+
+            assertThat(receivedResponses).hasSize(1);
+            assertThat(receivedResponses.get(0).getMessage()).isEqualTo(RESPONSE_MESSAGE);
+        });
+    }
+
+    @Test
+    void shouldCreateAttachmentsForBidirectionalStreamingWithAsynchronousStub() {
+        Request firstBidirectionalRequest = Request.newBuilder().setTopic("C").build();
+        Request secondBidirectionalRequest = Request.newBuilder().setTopic("D").build();
+
+        runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceStub asynchronousStub =
+                TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
+
+            List<Response> receivedResponses = new ArrayList<>();
+
+            Allure.step("async-root-bidi-stream", () -> {
+                StreamObserver<Response> responseObserver = new StreamObserver<Response>() {
+                    @Override public void onNext(Response value) { receivedResponses.add(value); }
+                    @Override public void onError(Throwable throwable) { }
+                    @Override public void onCompleted() { }
+                };
+
+                StreamObserver<Request> requestObserver = asynchronousStub.calculateBidiStream(responseObserver);
+                requestObserver.onNext(firstBidirectionalRequest);
+                requestObserver.onNext(secondBidirectionalRequest);
+                requestObserver.onCompleted();
+            });
+
+            assertThat(receivedResponses).hasSize(2);
+            assertThat(receivedResponses.get(0).getMessage()).isEqualTo(RESPONSE_MESSAGE);
+            assertThat(receivedResponses.get(1).getMessage()).isEqualTo(RESPONSE_MESSAGE);
+        });
+    }
+
+    @Test
+    void unaryRequestBodyIsCapturedAsJsonObject() throws Exception {
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
+            .willReturn(Response.newBuilder().setMessage("ok").build()));
+
+        Request request = Request.newBuilder().setTopic("topic-1").build();
+
+        AllureResults allureResults = runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceBlockingStub stub =
+                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            Response response = stub.calculate(request);
+            assertThat(response.getMessage()).isEqualTo("ok");
+        });
+
+        String jsonPayload = readJsonAttachmentByName(allureResults, "gRPC request (json)");
+        JsonNode actualJsonNode = JSON.readTree(jsonPayload);
+        JsonNode expectedJsonNode = JSON.createObjectNode().put("topic", "topic-1");
+
+        assertThat(actualJsonNode).isEqualTo(expectedJsonNode);
+    }
+
+    @Test
+    void unaryResponseBodyIsCapturedAsJsonObject() throws Exception {
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
+            .willReturn(Response.newBuilder().setMessage("hello-world").build()));
+
+        Request request = Request.newBuilder().setTopic("x").build();
+
+        AllureResults allureResults = runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceBlockingStub stub =
+                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            Response response = stub.calculate(request);
+            assertThat(response.getMessage()).isEqualTo("hello-world");
+        });
+
+        String jsonPayload = readJsonAttachmentByName(allureResults, "gRPC response (json)");
+        JsonNode actualJsonNode = JSON.readTree(jsonPayload);
+        JsonNode expectedJsonNode = JSON.createObjectNode().put("message", "hello-world");
+
+        assertThat(actualJsonNode).isEqualTo(expectedJsonNode);
+    }
+
+    @Test
+    void serverStreamingResponseBodyIsJsonArrayInOrder() throws Exception {
+        GrpcMock.stubFor(serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
+            .willReturn(asList(
+                Response.newBuilder().setMessage("first").build(),
+                Response.newBuilder().setMessage("second").build()
+            )));
+
+        Request request = Request.newBuilder().setTopic("stream-topic").build();
+
+        AllureResults allureResults = runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceBlockingStub stub =
+                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            Iterator<Response> responseIterator = stub.calculateServerStream(request);
+            assertThat(responseIterator.hasNext()).isTrue();
+            assertThat(responseIterator.next().getMessage()).isEqualTo("first");
+            assertThat(responseIterator.hasNext()).isTrue();
+            assertThat(responseIterator.next().getMessage()).isEqualTo("second");
+            assertThat(responseIterator.hasNext()).isFalse();
+        });
+
+        String jsonPayload = readJsonAttachmentByName(
+            allureResults, "gRPC response (collection of elements from Server stream) (json)"
+        );
+        JsonNode actualJsonArray = JSON.readTree(jsonPayload);
+
+        assertThat(actualJsonArray.isArray()).isTrue();
+        assertThat(actualJsonArray.size()).isEqualTo(2);
+        assertThat(actualJsonArray.get(0)).isEqualTo(JSON.createObjectNode().put("message", "first"));
+        assertThat(actualJsonArray.get(1)).isEqualTo(JSON.createObjectNode().put("message", "second"));
+    }
+    private static String readJsonAttachmentByName(AllureResults allureResults, String jsonAttachmentName) {
+        TestResult test = allureResults.getTestResults().get(0);
+
+        Attachment matchedAttachment = flattenSteps(test.getSteps()).stream()
+            .flatMap(step -> step.getAttachments().stream())
+            .filter(attachment -> jsonAttachmentName.equals(attachment.getName()))
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("Attachment not found: " + jsonAttachmentName));
+
+        String attachmentSourceKey = matchedAttachment.getSource();
+        Map<String, byte[]> attachmentsContent = allureResults.getAttachments();
+        byte[] rawAttachmentContent = attachmentsContent.get(attachmentSourceKey);
+        if (rawAttachmentContent == null) {
+            throw new IllegalStateException("Attachment content not found by source: " + attachmentSourceKey);
+        }
+        return new String(rawAttachmentContent, StandardCharsets.UTF_8);
+    }
+
+    protected final AllureResults executeUnary(Request request) {
+        return runWithinTestContext(() -> {
+            try {
+                TestServiceGrpc.TestServiceBlockingStub stub =
+                    TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                Response response = stub.calculate(request);
+                assertThat(response.getMessage()).isEqualTo(RESPONSE_MESSAGE);
+            } catch (Exception exception) {
+                throw new RuntimeException("Could not execute request " + request, exception);
+            }
+        });
+    }
+
+    protected final AllureResults executeServerStreaming(Request request) {
+        return runWithinTestContext(() -> {
+            try {
+                TestServiceGrpc.TestServiceBlockingStub stub =
+                    TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                Iterator<Response> responseIterator = stub.calculateServerStream(request);
+                int responseCount = 0;
+                while (responseIterator.hasNext()) {
+                    assertThat(responseIterator.next().getMessage()).isEqualTo(RESPONSE_MESSAGE);
+                    responseCount++;
+                }
+                assertThat(responseCount).isEqualTo(2);
+            } catch (Exception exception) {
+                throw new RuntimeException("Could not execute request " + request, exception);
+            }
+        });
+    }
+
+    protected final AllureResults executeUnaryExpectingException(Request request) {
+        return runWithinTestContext(() ->
+            assertThatExceptionOfType(StatusRuntimeException.class)
+                .isThrownBy(() -> {
+                    TestServiceGrpc.TestServiceBlockingStub stub =
+                        TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                    Response response = stub.calculate(request);
+                    assertThat(response.getMessage()).isEqualTo("ok");
+                })
+        );
+    }
+
+    private static List<StepResult> flattenSteps(List<StepResult> rootSteps) {
+        List<StepResult> allSteps = new ArrayList<>();
+        if (rootSteps == null) {
+            return allSteps;
+        }
+        for (StepResult step : rootSteps) {
+            allSteps.add(step);
+            allSteps.addAll(flattenSteps(step.getSteps()));
+        }
+        return allSteps;
+    }
+}
diff --git a/allure-grpc/src/test/proto/api.proto b/allure-grpc/src/test/proto/api.proto
new file mode 100644
index 000000000..378bb0872
--- /dev/null
+++ b/allure-grpc/src/test/proto/api.proto
@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "io.qameta.allure.grpc";
+
+service TestService {
+  rpc Calculate (Request) returns (Response);
+  rpc CalculateServerStream (Request) returns (stream Response);
+  rpc CalculateClientStream (stream Request) returns (Response);
+  rpc CalculateBidiStream (stream Request) returns (stream Response);
+}
+
+message Request {
+  string topic = 1;
+}
+
+message Response {
+  string message = 1;
+}
diff --git a/allure-cucumber-jvm/src/test/resources/allure.properties b/allure-grpc/src/test/resources/allure.properties
similarity index 100%
rename from allure-cucumber-jvm/src/test/resources/allure.properties
rename to allure-grpc/src/test/resources/allure.properties
diff --git a/allure-hamcrest/build.gradle.kts b/allure-hamcrest/build.gradle.kts
new file mode 100644
index 000000000..6b0e5dd3a
--- /dev/null
+++ b/allure-hamcrest/build.gradle.kts
@@ -0,0 +1,27 @@
+description = "Allure Hamcrest Assertions Integration"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    compileOnly("org.aspectj:aspectjrt")
+    compileOnly("org.hamcrest:hamcrest")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.hamcrest:hamcrest")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.hamcrest"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
new file mode 100644
index 000000000..d78020e78
--- /dev/null
+++ b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
@@ -0,0 +1,129 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.hamcrest;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.AfterReturning;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.util.ObjectUtils;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+
+import java.util.UUID;
+
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+
+/**
+ * <p>
+ * Aspect "interceptor" for automatic logging to the Allure report.
+ * </p>
+ * <p>
+ * This aspect should work for all asserts that are in the Hamcrest library, since they all go through a single method
+ * to start the comparison.
+ * </p>
+ * <p>
+ * In addition to the standard comparisons that are already in the Hamcrest library, this aspect should work correctly
+ * with custom matchers if developers correctly implemented the describeMismatch and / or describeMismatchSafely
+ * methods in the TypeSafeMatcher class.
+ * </p>
+ *
+ * @author a-simeshin (Simeshin Artem)
+ * @see org.hamcrest.TypeSafeMatcher
+ */
+@Aspect
+@SuppressWarnings("all")
+public class AllureHamcrestAssert {
+
+    private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
+        @Override
+        protected AllureLifecycle initialValue() {
+            return Allure.getLifecycle();
+        }
+    };
+
+    public static AllureLifecycle getLifecycle() {
+        return lifecycle.get();
+    }
+
+    @Pointcut("execution(void org.hamcrest.MatcherAssert.**(..))")
+    public void initAssertThat() {
+    }
+
+    /**
+     * <p>
+     * assertThat(String comment, Object actual, Matcher expected) - one and only one central entry point for all
+     * asserts. Based on this rule, you only need to log a method with three arguments.
+     * </p>
+     * <p>
+     * Even if there is no comment as the first argument, an empty string will be passed as the first argument.
+     * </p>
+     * <p>
+     * For example assertThat(value123.get(), is(equalTo("value123"))) will be proxied to the metod
+     * assertThat("", value123.get(), is(equalTo("value123")))
+     * </p>
+     *
+     * @param joinPoint - entry point with args and method name
+     */
+    @Before("initAssertThat()")
+    public void catchAndStartStep(final JoinPoint joinPoint) {
+        if (joinPoint.getArgs().length == 3) {
+            final String reason = (String) joinPoint.getArgs()[0];
+            final String actual = ObjectUtils.toString(joinPoint.getArgs()[1]);
+            final StringDescription description = new StringDescription();
+            final String expecting = description.appendText("assert \"")
+                    .appendText(actual)
+                    .appendText("\" ")
+                    .appendDescriptionOf((Matcher) joinPoint.getArgs()[2])
+                    .toString();
+
+            getLifecycle().startStep(
+                    UUID.randomUUID().toString(),
+                    new StepResult()
+                            .setName(reason.isEmpty() ? expecting : expecting + " | " + reason)
+                            .setDescription("Hamcrest assert")
+                            .setStatus(Status.PASSED)
+            );
+        }
+    }
+
+    @AfterThrowing(pointcut = "initAssertThat()", throwing = "e")
+    public void stepFailed(final Throwable e) {
+        getLifecycle().updateStep(s -> s.setStatus(getStatus(e).orElse(Status.BROKEN)));
+        getLifecycle().stopStep();
+    }
+
+    @AfterReturning(pointcut = "initAssertThat()")
+    public void stepStop() {
+        getLifecycle().updateStep(s -> s.setStatus(Status.PASSED));
+        getLifecycle().stopStep();
+    }
+
+    /**
+     * For tests only.
+     *
+     * @param allure allure lifecycle to set
+     */
+    public static void setLifecycle(final AllureLifecycle allure) {
+        lifecycle.set(allure);
+    }
+}
diff --git a/allure-hamcrest/src/main/resources/META-INF/aop-ajc.xml b/allure-hamcrest/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..5a9f73e6c
--- /dev/null
+++ b/allure-hamcrest/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,6 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.hamcrest.AllureHamcrestAssert"/>
+    </aspects>
+</aspectj>
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
new file mode 100644
index 000000000..f04ba4d74
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
@@ -0,0 +1,65 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalToIgnoringCase;
+
+/**
+ * This tests should cover cases when reason string exists in assertion.
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestAssertionNameContainsReasonTest {
+
+    @Test
+    void hamcrestAssertNameWithComment() {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(
+                        "Business always likes something weird",
+                        "TheBiscuit",
+                        equalToIgnoringCase("thebiscuit")
+                ),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly("assert \"TheBiscuit\" a string equal to \"thebiscuit\" ignoring case | Business always likes something weird");
+    }
+
+    @Test
+    void hamcrestAssertNameWoComment() {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(
+                        "TheBiscuit",
+                        equalToIgnoringCase("thebiscuit")
+                ),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly("assert \"TheBiscuit\" a string equal to \"thebiscuit\" ignoring case");
+    }
+}
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
new file mode 100644
index 000000000..a8c07b827
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
@@ -0,0 +1,132 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Collections" section
+ * <ui>
+ * <li>array</li>
+ * <li>hasEntry</li>
+ * <li>hasKey</li>
+ * <li>hasValue</li>
+ * <li>hasItem</li>
+ * <li>hasItems</li>
+ * <li>hasItemInArray</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestCollectionsMatchersTest {
+
+    @Test
+    void hamcrestAssertNameForArrayMatchers() {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(new Integer[]{1,2,3}, is(array(equalTo(1), equalTo(2), equalTo(3)))),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly("assert \"[1, 2, 3]\" is [<1>, <2>, <3>]");
+    }
+
+    private static Stream<Arguments> mapTestCases() {
+        HashMap<String, Integer> map = new HashMap<String, Integer>();
+        map.put("key1", 1);
+        map.put("key2", 2);
+        map.put("key3", 3);
+
+        return Stream.of(
+                Arguments.of(
+                        map, hasEntry(equalTo("key1"), equalTo(1)),
+                        "assert \"{key1=1, key2=2, key3=3}\" map containing [\"key1\"-><1>]"
+                ),
+                Arguments.of(
+                        map, hasKey(equalTo("key2")),
+                        "assert \"{key1=1, key2=2, key3=3}\" map containing [\"key2\"->ANYTHING]"
+                ),
+                Arguments.of(
+                        map, hasValue(equalTo(3)),
+                        "assert \"{key1=1, key2=2, key3=3}\" map containing [ANYTHING-><3>]"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("mapTestCases")
+    void hamcrestAssertNameForMapMatchers(Map actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+
+    private static Stream<Arguments> iterableTestCases() {
+        List<String> list = Arrays.asList("val1", "val2", "val3");
+
+        return Stream.of(
+                Arguments.of(
+                        list, hasItem(equalTo("key1")),
+                        "assert \"[val1, val2, val3]\" a collection containing \"key1\""
+                ),
+                Arguments.of(
+                        list, hasItems(startsWith("v"), endsWith("l2")),
+                        "assert \"[val1, val2, val3]\" (a collection containing a string starting with \"v\" and a collection containing a string ending with \"l2\")"
+                ),
+                Arguments.of(
+                        list, hasItemInArray(Arrays.asList("val1", "val2")),
+                        "assert \"[val1, val2, val3]\" an array containing <[val1, val2]>"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("iterableTestCases")
+    void hamcrestAssertNameForIterableMatchers(Iterable actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
new file mode 100644
index 000000000..5d0a376d1
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
@@ -0,0 +1,74 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Logical" section
+ * <ui>
+ * <li>allOf</li>
+ * <li>anyOf</li>
+ * <li>not</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestLogicalMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        return Stream.of(
+                Arguments.of(
+                        "thebiscuit", allOf(startsWith("the"), containsString("biscuit")),
+                        "assert \"thebiscuit\" (a string starting with \"the\" and a string containing \"biscuit\")"
+                ),
+                Arguments.of(
+                        "thebiscuit", anyOf(startsWith("the"), containsString("test")),
+                        "assert \"thebiscuit\" (a string starting with \"the\" or a string containing \"test\")"
+                ),
+                Arguments.of(
+                        "test", is(not(anyOf(startsWith("the"), containsString("biscuit")))),
+                        "assert \"test\" is not (a string starting with \"the\" or a string containing \"biscuit\")"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForLogicalMatchers(String actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
new file mode 100644
index 000000000..f5fa62efa
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
@@ -0,0 +1,84 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Number" section
+ * <ui>
+ * <li>closeTo</li>
+ * <li>greaterThan</li>
+ * <li>greaterThanOrEqualTo</li>
+ * <li>lessThan</li>
+ * <li>lessThanOrEqualTo</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestNumberMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        return Stream.of(
+                Arguments.of(
+                        0.434d, is(closeTo(0.41d, 0.45d)),
+                        "assert \"0.434\" is a numeric value within <0.45> of <0.41>"
+                ),
+                Arguments.of(
+                        0.434d, is(greaterThan(0.41d)),
+                        "assert \"0.434\" is a value greater than <0.41>"
+                ),
+                Arguments.of(
+                        0.434d, is(greaterThanOrEqualTo(0.41d)),
+                        "assert \"0.434\" is a value equal to or greater than <0.41>"
+                ),
+                Arguments.of(
+                        0.41d, is(lessThan(0.434d)),
+                        "assert \"0.41\" is a value less than <0.434>"
+                ),
+                Arguments.of(
+                        0.41d, is(lessThanOrEqualTo(0.434d)),
+                        "assert \"0.41\" is a value less than or equal to <0.434>"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForNumberMatchers(double actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
new file mode 100644
index 000000000..44d468b1c
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Object" section
+ * <ui>
+ * <li>equalTo</li>
+ * <li>hasToString</li>
+ * <li>instanceOf</li>
+ * <li>isCompatibleType in new version typeCompatibleWith</li>
+ * <li>notNullValue</li>
+ * <li>nullValue</li>
+ * <li>sameInstance</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestObjectMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        final String testVal = "test_test";
+
+        return Stream.of(
+                Arguments.of(
+                        "thebiscuit", is(equalTo("thebiscuit")),
+                        "assert \"thebiscuit\" is \"thebiscuit\""
+                ),
+                Arguments.of(
+                        true, hasToString("TRUE"),
+                        "assert \"true\" with toString() \"TRUE\""
+                ),
+                Arguments.of(
+                        Arrays.asList("key1", "key2"), instanceOf(Iterable.class),
+                        "assert \"[key1, key2]\" an instance of java.lang.Iterable"
+                ),
+                Arguments.of(
+                        Integer.class, typeCompatibleWith(Number.class),
+                        "assert \"class java.lang.Integer\" type < java.lang.Number"
+                ),
+                Arguments.of(
+                        "test", is(notNullValue()),
+                        "assert \"test\" is not null"
+                ),
+                Arguments.of(
+                        "test", is(not(nullValue())),
+                        "assert \"test\" is not null"
+                ),
+                Arguments.of(
+                        testVal, is(sameInstance(testVal)),
+                        "assert \"test_test\" is sameInstance(\"test_test\")"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForObjectMatchers(Object actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
new file mode 100644
index 000000000..cddd89106
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
@@ -0,0 +1,89 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.TestInstance;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Text" section
+ * <ui>
+ * <li>equalToIgnoringCase</li>
+ * <li>equalToIgnoringWhiteSpace(deprecated) - suggesting in code to use equalToCompressingWhiteSpace</li>
+ * <li>containsString</li>
+ * <li>endsWith</li>
+ * <li>startsWith</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestTextMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        return Stream.of(
+                Arguments.of(
+                        "thebiscuit", equalToIgnoringCase("TheBiscuit"),
+                        "assert \"thebiscuit\" a string equal to \"TheBiscuit\" ignoring case"
+                ),
+                Arguments.of(
+                        "The Biscuit", equalToIgnoringWhiteSpace("TheBiscuit"),
+                        "assert \"The Biscuit\" a string equal to \"TheBiscuit\" compressing white space"
+                ),
+                Arguments.of(
+                        "The Biscuit", equalToCompressingWhiteSpace("TheBiscuit"),
+                        "assert \"The Biscuit\" a string equal to \"TheBiscuit\" compressing white space"
+                ),
+                Arguments.of(
+                        "The Biscuit", containsString("TheBiscuit"),
+                        "assert \"The Biscuit\" a string containing \"TheBiscuit\""
+                ),
+                Arguments.of(
+                        "The Biscuit", endsWith("Biscuit"),
+                        "assert \"The Biscuit\" a string ending with \"Biscuit\""
+                ),
+                Arguments.of(
+                        "The Biscuit", startsWith("Biscuit"),
+                        "assert \"The Biscuit\" a string starting with \"Biscuit\""
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForTextMatchers(String actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
diff --git a/allure-httpclient/build.gradle.kts b/allure-httpclient/build.gradle.kts
index bb9cbcc46..9f3b4c554 100644
--- a/allure-httpclient/build.gradle.kts
+++ b/allure-httpclient/build.gradle.kts
@@ -1,13 +1,13 @@
 description = "Allure Apache HttpClient Integration"
 
-val agent: Configuration by configurations.creating
+val httpClient4Version = "4.5.14";
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
-    implementation("org.apache.httpcomponents:httpclient")
+    compileOnly("org.apache.httpcomponents:httpclient:$httpClient4Version")
     testImplementation("com.github.tomakehurst:wiremock")
     testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.apache.httpcomponents:httpclient:$httpClient4Version")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
@@ -27,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
index 51b7be410..fdbbc52fc 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.protocol.HttpContext;
@@ -45,7 +44,7 @@ public class AllureHttpClientRequest implements HttpRequestInterceptor {
 
     public AllureHttpClientRequest() {
         this(new FreemarkerAttachmentRenderer("http-request.ftl"),
-                new DefaultAttachmentProcessor()
+             new DefaultAttachmentProcessor()
         );
     }
 
@@ -55,25 +54,33 @@ public AllureHttpClientRequest(final AttachmentRenderer<AttachmentData> renderer
         this.processor = processor;
     }
 
+    private static String getAttachmentName(final HttpRequest request) {
+        return String.format("Request_%s_%s", request.getRequestLine().getMethod(),
+                             request.getRequestLine().getUri());
+    }
+
     @Override
     public void process(final HttpRequest request,
-                        final HttpContext context) throws HttpException, IOException {
-        final HttpRequestAttachment.Builder builder = create("Request", request.getRequestLine().getUri())
+                        final HttpContext context) throws IOException {
+
+        final HttpRequestAttachment.Builder builder = create(getAttachmentName(request),
+                                                             request.getRequestLine().getUri())
                 .setMethod(request.getRequestLine().getMethod());
 
         Stream.of(request.getAllHeaders())
-                .forEach(header -> builder.setHeader(header.getName(), header.getValue()));
+              .forEach(header -> builder.setHeader(header.getName(), header.getValue()));
 
         if (request instanceof HttpEntityEnclosingRequest) {
             final HttpEntity entity = ((HttpEntityEnclosingRequest) request).getEntity();
 
-            final ByteArrayOutputStream os = new ByteArrayOutputStream();
-            entity.writeTo(os);
+            if (entity != null) {
+                final ByteArrayOutputStream os = new ByteArrayOutputStream();
+                entity.writeTo(os);
 
-            final String body = new String(os.toByteArray(), StandardCharsets.UTF_8);
-            builder.setBody(body);
+                final String body = new String(os.toByteArray(), StandardCharsets.UTF_8);
+                builder.setBody(body);
+            }
         }
-
         final HttpRequestAttachment requestAttachment = builder.build();
         processor.addAttachment(requestAttachment, renderer);
     }
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
index 0507beb86..1eb4bfe75 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,17 +21,13 @@
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import io.qameta.allure.attachment.http.HttpResponseAttachment;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.entity.HttpEntityWrapper;
+import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.stream.Stream;
 
 import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
@@ -67,10 +63,12 @@ public void process(final HttpResponse response,
                 .forEach(header -> builder.setHeader(header.getName(), header.getValue()));
 
         if (response.getEntity() != null) {
-            final LoggableEntity loggableEntity = new LoggableEntity(response.getEntity());
-            response.setEntity(loggableEntity);
+            if (!response.getEntity().isRepeatable()) {
+                final BufferedHttpEntity bufferedEntity = new BufferedHttpEntity(response.getEntity());
+                response.setEntity(bufferedEntity);
+            }
 
-            builder.setBody(loggableEntity.getBody());
+            builder.setBody(EntityUtils.toString(response.getEntity()));
         } else {
             builder.setBody("No body present");
         }
@@ -78,26 +76,4 @@ public void process(final HttpResponse response,
         final HttpResponseAttachment responseAttachment = builder.build();
         processor.addAttachment(responseAttachment, renderer);
     }
-
-    /**
-     * Required to allow consume httpEntity twice.
-     */
-    private static class LoggableEntity extends HttpEntityWrapper {
-
-        private final byte[] rawContent;
-
-        LoggableEntity(final HttpEntity wrappedEntity) throws IOException {
-            super(wrappedEntity);
-            rawContent = EntityUtils.toByteArray(wrappedEntity);
-        }
-
-        public String getBody() {
-            return new String(rawContent, StandardCharsets.UTF_8);
-        }
-
-        @Override
-        public InputStream getContent() {
-            return new ByteArrayInputStream(rawContent);
-        }
-    }
 }
diff --git a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
index fbbf67ba8..ddc3019ed 100644
--- a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
+++ b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +20,9 @@
 import io.qameta.allure.attachment.AttachmentProcessor;
 import io.qameta.allure.attachment.AttachmentRenderer;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
@@ -33,7 +35,9 @@
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.noContent;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
@@ -65,6 +69,9 @@ void setUp() {
         stubFor(get(urlEqualTo("/empty"))
                 .willReturn(aResponse()
                         .withStatus(304)));
+
+        stubFor(delete(urlEqualTo("/hello"))
+                .willReturn(noContent()));
     }
 
     @AfterEach
@@ -155,4 +162,49 @@ void shouldCreateResponseAttachmentWithEmptyBody() throws Exception {
                 .extracting("body")
                 .containsExactly("No body present");
     }
+
+    @Test
+    void shouldCreateRequestAttachmentWithEmptyBodyWhenNoContentIsReturned() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                                                           .addInterceptorLast(new AllureHttpClientRequest(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpDelete httpDelete = new HttpDelete(String.format("http://localhost:%d/hello", server.port()));
+            try (CloseableHttpResponse response = httpClient.execute(httpDelete)) {
+                assertThat(response.getEntity())
+                        .isEqualTo(null);
+            }
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsNull();
+    }
+
+    @Test
+    void shouldNotConsumeBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                                                           .addInterceptorLast(new AllureHttpClientResponse(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+          final HttpGet httpGet = new HttpGet(String.format("http://localhost:%d/hello", server.port()));
+          try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
+              response.getStatusLine().getStatusCode();
+              BufferedHttpEntity ent = new BufferedHttpEntity(response.getEntity());
+              assertThat(EntityUtils.toString(ent))
+                      .isEqualTo(BODY_STRING);
+          }
+        }
+    }
 }
diff --git a/allure-httpclient5/build.gradle.kts b/allure-httpclient5/build.gradle.kts
new file mode 100644
index 000000000..aa6d53179
--- /dev/null
+++ b/allure-httpclient5/build.gradle.kts
@@ -0,0 +1,30 @@
+description = "Allure Apache HttpClient5 Integration"
+
+val httpClient5Version = "5.3.1";
+
+dependencies {
+    api(project(":allure-attachments"))
+    compileOnly("org.apache.httpcomponents.client5:httpclient5:$httpClient5Version")
+    testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.apache.httpcomponents.client5:httpclient5:$httpClient5Version")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.httpclient5"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-httpclient5/readme.md b/allure-httpclient5/readme.md
new file mode 100644
index 000000000..b307e4e4f
--- /dev/null
+++ b/allure-httpclient5/readme.md
@@ -0,0 +1,56 @@
+## Allure-httpclient5
+Extended logging for requests and responses with [httpclient5](https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5)
+This library does not support `httpclient` due to package and API changes between `httpclient` and `httpclient5`.
+To work with `httpclient`, it is recommended to use the `allure-httpclient` library.
+
+## Wiki
+https://hc.apache.org/httpcomponents-client-5.2.x/
+https://hc.apache.org/httpcomponents-client-5.2.x/quickstart.html
+https://hc.apache.org/httpcomponents-client-5.2.x/migration-guide/index.html
+https://hc.apache.org/httpcomponents-client-5.2.x/examples.html
+
+## Additional features
+Implemented:
+- The `httpclient5` library uses `gzip` compression by default. Interceptors attach message bodies in decompressed form
+- `HttpEntityEnclosingRequest` is removed from `httpclient5`. Request interceptor works wo `HttpEntityEnclosingRequest`
+
+Not tested:
+- The httpclient5 library support Async interactions (Not tested)
+
+## Examples
+
+```java
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import io.qameta.allure.httpclient5.AllureHttpClient5Request;
+import io.qameta.allure.httpclient5.AllureHttpClient5Response;
+
+class Test {
+    
+    @Test
+    void smokeGetShouldNotThrowThenReturnCorrectResponseMessage() throws IOException {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet("/hello");
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+    }
+}
+```
+
+In addition to using standard templates for formatting, you can use your custom `ftl` templates along the path 
+`/resources/tpl/...`. For examples, you can use templates from the `allure-attachments` module.
+
+```java
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request("your-request-template-attachment.ftl"))
+                .addResponseInterceptorLast(new AllureHttpClient5Response("your-response-template-attachment.ftl"));
+```
\ No newline at end of file
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
new file mode 100644
index 000000000..14167a41d
--- /dev/null
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
@@ -0,0 +1,84 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import io.qameta.allure.attachment.DefaultAttachmentProcessor;
+import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import io.qameta.allure.attachment.http.HttpRequestAttachment;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.protocol.HttpContext;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
+
+/**
+ * @author a-simeshin (Simeshin Artem)
+ */
+public class AllureHttpClient5Request implements HttpRequestInterceptor {
+
+    private final AttachmentRenderer<AttachmentData> renderer;
+    private final AttachmentProcessor<AttachmentData> processor;
+
+    public AllureHttpClient5Request() {
+        this("http-request.ftl");
+    }
+
+    public AllureHttpClient5Request(final String templateName) {
+        this(new FreemarkerAttachmentRenderer(templateName), new DefaultAttachmentProcessor());
+    }
+
+    public AllureHttpClient5Request(final AttachmentRenderer<AttachmentData> renderer,
+                                    final AttachmentProcessor<AttachmentData> processor) {
+        this.renderer = renderer;
+        this.processor = processor;
+    }
+
+    /**
+     * Processes the HTTP request and adds an attachment to the Allure Attachment processor.
+     *
+     * @param request the HTTP request
+     * @param entity  the entity details
+     * @param context the HTTP context
+     */
+    @Override
+    public void process(final HttpRequest request,
+                        final EntityDetails entity,
+                        final HttpContext context) {
+        final String attachmentName = getAttachmentName(request);
+        final HttpRequestAttachment.Builder builder = create(attachmentName, request.getRequestUri());
+        builder.setMethod(request.getMethod());
+
+        Stream.of(request.getHeaders()).forEach(header -> builder.setHeader(header.getName(), header.getValue()));
+
+        if (entity instanceof HttpEntity && ((HttpEntity) entity).isRepeatable() && entity.getContentLength() != 0) {
+            builder.setBody(AllureHttpEntityUtils.getBody((HttpEntity) entity));
+        }
+
+        processor.addAttachment(builder.build(), renderer);
+    }
+
+    private String getAttachmentName(final HttpRequest request) {
+        return String.format("Request_%s_%s", request.getMethod(), request.getRequestUri());
+    }
+
+}
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
new file mode 100644
index 000000000..eb515ea3a
--- /dev/null
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
@@ -0,0 +1,102 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import io.qameta.allure.attachment.DefaultAttachmentProcessor;
+import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import io.qameta.allure.attachment.http.HttpResponseAttachment;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.io.entity.BufferedHttpEntity;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
+import org.apache.hc.core5.http.protocol.HttpContext;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
+
+/**
+ * @author a-simeshin (Simeshin Artem)
+ */
+@SuppressWarnings({
+        "checkstyle:ParameterAssignment",
+        "PMD.AvoidReassigningParameters"})
+public class AllureHttpClient5Response implements HttpResponseInterceptor {
+    private final AttachmentRenderer<AttachmentData> renderer;
+    private final AttachmentProcessor<AttachmentData> processor;
+    private static final String NO_BODY = "No body present";
+
+    public AllureHttpClient5Response() {
+        this("http-response.ftl");
+    }
+
+    public AllureHttpClient5Response(final String templateName) {
+        this(new FreemarkerAttachmentRenderer(templateName), new DefaultAttachmentProcessor());
+    }
+
+    public AllureHttpClient5Response(final AttachmentRenderer<AttachmentData> renderer,
+                                     final AttachmentProcessor<AttachmentData> processor) {
+        this.renderer = renderer;
+        this.processor = processor;
+    }
+
+    /**
+     * Processes the HTTP response and adds an attachment to the Allure Attachment processor.
+     *
+     * @param response the HTTP response
+     * @param entity   the entity details, may be null for no response body responses
+     * @param context  the HTTP context
+     * @throws IOException if an I/O error occurs
+     */
+    @SuppressWarnings("PMD.CloseResource")
+    @Override
+    public void process(final HttpResponse response,
+                        EntityDetails entity,
+                        final HttpContext context) throws IOException {
+        final HttpResponseAttachment.Builder builder = create("Response");
+        builder.setResponseCode(response.getCode());
+
+        Stream.of(response.getHeaders()).forEach(header -> builder.setHeader(header.getName(), header.getValue()));
+
+        final HttpEntity originalHttpEntity = (HttpEntity) entity;
+        if (originalHttpEntity != null && !originalHttpEntity.isRepeatable()) {
+            // Looks like a bug or completely new logic. It's not enough to replace chaining EntityDetails entity.
+            // To read the response body twice, It needs to put in the context also
+            entity = new BufferedHttpEntity(originalHttpEntity);
+            final BasicClassicHttpResponse responseEntity =
+                    (BasicClassicHttpResponse) context.getAttribute("http.response");
+            responseEntity.setEntity((HttpEntity) entity);
+
+            final String responseBody = AllureHttpEntityUtils.getBody((HttpEntity) entity);
+            if (responseBody == null || responseBody.isEmpty()) {
+                builder.setBody(NO_BODY);
+            } else {
+                builder.setBody(responseBody);
+            }
+        } else {
+            builder.setBody(NO_BODY);
+        }
+
+        processor.addAttachment(builder.build(), renderer);
+    }
+
+}
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
new file mode 100644
index 000000000..de2cdd03d
--- /dev/null
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
@@ -0,0 +1,96 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import io.qameta.allure.AllureResultsWriteException;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * Utility class for working with HTTP entity in Allure framework.
+ */
+@SuppressWarnings({"checkstyle:ParameterAssignment"})
+public final class AllureHttpEntityUtils {
+
+    private AllureHttpEntityUtils() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    /**
+     * Retrieves the body of the HTTP entity as a string.
+     *
+     * @param httpEntity the HTTP entity
+     * @return the body of the HTTP entity as a string
+     * @throws AllureResultsWriteException if an error occurs while reading the entity body
+     */
+    static String getBody(final HttpEntity httpEntity) {
+        try {
+            final String contentEncoding = httpEntity.getContentEncoding();
+            if (contentEncoding != null && contentEncoding.contains("gzip")) {
+                return unpackGzipEntityString(httpEntity);
+            } else {
+                return EntityUtils.toString(httpEntity, getContentEncoding(httpEntity.getContentEncoding()));
+            }
+        } catch (IOException | ParseException e) {
+            throw new AllureResultsWriteException("Can't read request message body to String", e);
+        }
+    }
+
+    /**
+     * Retrieves the content encoding of the HTTP entity.
+     *
+     * @param contentEncoding the content encoding value
+     * @return the charset corresponding to the content encoding, or UTF-8 if the encoding is invalid
+     */
+    static Charset getContentEncoding(final String contentEncoding) {
+        try {
+            return Charset.forName(contentEncoding);
+        } catch (IllegalArgumentException ignored) {
+            return StandardCharsets.UTF_8;
+        }
+    }
+
+    /**
+     * Unpacks the GZIP-encoded entity string.
+     *
+     * @param entity the GZIP-encoded HTTP entity
+     * @return the unpacked entity string
+     * @throws IOException if an error occurs while unpacking the entity
+     */
+    static String unpackGzipEntityString(final HttpEntity entity) throws IOException {
+        final GZIPInputStream gis = new GZIPInputStream(entity.getContent());
+        final Charset contentEncoding = getContentEncoding(entity.getContentEncoding());
+        try (InputStreamReader inputStreamReader = new InputStreamReader(gis, contentEncoding)) {
+            try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
+                final StringBuilder outStr = new StringBuilder();
+                String line;
+                while ((line = bufferedReader.readLine()) != null) {
+                    outStr.append(line);
+                }
+                return outStr.toString();
+            }
+        }
+    }
+
+}
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
new file mode 100644
index 000000000..364ea253f
--- /dev/null
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
@@ -0,0 +1,140 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import org.apache.hc.client5.http.classic.methods.HttpDelete;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Objects;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+@SuppressWarnings({"unchecked", "PMD.JUnitTestContainsTooManyAsserts"})
+class AllureHttpClient5DeleteTest {
+
+    private static final String DELETE_URL = "http://localhost:%d/delete";
+    private static final String HELLO_RESOURCE_PATH = "/delete";
+
+    private WireMockServer server;
+
+    @BeforeEach
+    void setUp() {
+        server = new WireMockServer(options().dynamicPort());
+        server.start();
+        configureFor(server.port());
+
+        stubFor(delete(HELLO_RESOURCE_PATH).willReturn(
+                aResponse()
+                        .withStatus(204))
+        );
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (Objects.nonNull(server)) {
+            server.stop();
+        }
+    }
+
+    @Test
+    void smokeDeleteShouldNotThrowThenReturnCorrectCode() {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        assertDoesNotThrow(() -> {
+            try (CloseableHttpClient httpClient = builder.build()) {
+                final HttpDelete httpDelete = new HttpDelete(String.format(DELETE_URL, server.port()));
+                httpClient.execute(httpDelete, response -> {
+                    assertThat(response.getCode()).isEqualTo(204);
+                    return response;
+                });
+            }
+        });
+    }
+
+    @Test
+    void shouldCreateDeleteRequestAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpDelete httpDelete = new HttpDelete(String.format(DELETE_URL, server.port()));
+            httpClient.execute(httpDelete, response -> {
+                assertThat(response.getCode()).isEqualTo(204);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+
+        verify(processor, times(1)).addAttachment(captor.capture(), eq(renderer));
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("url")
+                .containsExactly(HELLO_RESOURCE_PATH);
+    }
+    @Test
+    void shouldCreateDeleteResponseAttachmentWithEmptyBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpDelete httpDelete = new HttpDelete(String.format(DELETE_URL, server.port()));
+            httpClient.execute(httpDelete, response -> {
+                assertThat(response.getCode()).isEqualTo(204);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsExactly("No body present");
+    }
+}
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
new file mode 100644
index 000000000..301e13862
--- /dev/null
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
@@ -0,0 +1,176 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Objects;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+@SuppressWarnings({"unchecked", "PMD.JUnitTestContainsTooManyAsserts"})
+class AllureHttpClient5GetTest {
+
+    private static final String BODY_STRING = "Hello world!";
+    private static final String HELLO_RESOURCE_PATH = "/hello";
+    private static final String HELLO_GET_RETURN_BODY = "http://localhost:%d/hello";
+    private static final String HELLO_GET_201_NO_BODY = "http://localhost:%d/empty";
+
+
+    private WireMockServer server;
+
+    @BeforeEach
+    void setUp() {
+        server = new WireMockServer(options().dynamicPort());
+        server.start();
+        configureFor(server.port());
+
+        stubFor(get(HELLO_RESOURCE_PATH).willReturn(
+                aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(BODY_STRING)
+        ));
+        stubFor(get("/empty").willReturn(
+                aResponse()
+                        .withStatus(200))
+        );
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (Objects.nonNull(server)) {
+            server.stop();
+        }
+    }
+
+    @Test
+    void smokeGetShouldNotThrowThenReturnCorrectResponseMessage() {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        assertDoesNotThrow(() -> {
+            try (CloseableHttpClient httpClient = builder.build()) {
+                final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_RETURN_BODY, server.port()));
+                httpClient.execute(httpGet, response -> {
+                    assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                    return response;
+                });
+            }
+        });
+    }
+
+    @Test
+    void shouldCreateGetRequestAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorLast(new AllureHttpClient5Request(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_RETURN_BODY, server.port()));
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+
+        verify(processor, times(1)).addAttachment(captor.capture(), eq(renderer));
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("url")
+                .containsExactly(HELLO_RESOURCE_PATH);
+    }
+
+    @Test
+    void shouldCreateGetResponseAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_RETURN_BODY, server.port()));
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("responseCode")
+                .containsExactly(200);
+    }
+
+    @Test
+    void shouldCreateGetResponseAttachmentWithEmptyBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_201_NO_BODY, server.port()));
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo("");
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsExactly("No body present");
+    }
+}
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
new file mode 100644
index 000000000..6b73e36dd
--- /dev/null
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
@@ -0,0 +1,187 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Objects;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+@SuppressWarnings({"unchecked", "PMD.JUnitTestContainsTooManyAsserts"})
+class AllureHttpClient5PostTest {
+
+    private static final String BODY_STRING = "Hello world!";
+    private static final String POST_REQUEST_BODY = "hello post request body";
+    private static final String HELLO_RESOURCE_PATH = "/hello";
+    private static final String HELLO_POST_RETURN_BODY = "http://localhost:%d/hello";
+    private static final String HELLO_POST_201_NO_BODY = "http://localhost:%d/empty";
+
+
+    private WireMockServer server;
+
+    @BeforeEach
+    void setUp() {
+        server = new WireMockServer(options().dynamicPort());
+        server.start();
+        configureFor(server.port());
+
+        stubFor(post(HELLO_RESOURCE_PATH).willReturn(
+                aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(BODY_STRING)
+        ));
+        stubFor(post("/empty").willReturn(
+                aResponse()
+                        .withStatus(201))
+        );
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (Objects.nonNull(server)) {
+            server.stop();
+        }
+    }
+
+    @Test
+    void smokePostShouldNotThrowThenReturnCorrectResponseMessage() {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        assertDoesNotThrow(() -> {
+            try (CloseableHttpClient httpClient = builder.build()) {
+                final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_RETURN_BODY, server.port()));
+                httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+                httpClient.execute(httpPost, response -> {
+                    response.getCode();
+                    assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                    return response;
+                });
+            }
+        });
+    }
+
+    @Test
+    void shouldCreatePostRequestAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_RETURN_BODY, server.port()));
+            httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+            httpClient.execute(httpPost, response -> {
+                response.getCode();
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+
+        verify(processor, times(1)).addAttachment(captor.capture(), eq(renderer));
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("url")
+                .containsExactly(HELLO_RESOURCE_PATH);
+    }
+
+    @Test
+    void shouldCreatePostResponseAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_RETURN_BODY, server.port()));
+            httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+            httpClient.execute(httpPost, response -> {
+                response.getCode();
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("responseCode")
+                .containsExactly(200);
+    }
+
+    @Test
+    void shouldCreatePostResponseAttachmentWithEmptyBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_201_NO_BODY, server.port()));
+            httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+            httpClient.execute(httpPost, response -> {
+                response.getCode();
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo("");
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsExactly("No body present");
+    }
+}
diff --git a/allure-cucumber2-jvm/src/test/resources/allure.properties b/allure-httpclient5/src/test/resources/allure.properties
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/allure.properties
rename to allure-httpclient5/src/test/resources/allure.properties
diff --git a/allure-java-commons-test/build.gradle.kts b/allure-java-commons-test/build.gradle.kts
index 3141a7a13..e1d5c3995 100644
--- a/allure-java-commons-test/build.gradle.kts
+++ b/allure-java-commons-test/build.gradle.kts
@@ -2,7 +2,10 @@ description = "Allure Java Commons Test Utils"
 
 dependencies {
     api("commons-io:commons-io")
+    api("io.github.benas:random-beans")
+    api("org.apache.commons:commons-lang3")
     api(project(":allure-java-commons"))
+    implementation("com.fasterxml.jackson.core:jackson-databind")
 }
 
 tasks.jar {
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
index 53a040a09..d059716fc 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings({"JavadocType", "PMD.MissingStaticMethodInNonInstantiatableClass"})
+@SuppressWarnings({"JavadocType"})
 @Target({})
 public @interface AllureFeatures {
 
@@ -222,4 +222,20 @@
     @Feature("Timeline")
     @interface Severity {
     }
+
+    @Documented
+    @Inherited
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.METHOD, ElementType.TYPE})
+    @Feature("Filtration")
+    @interface Filtration {
+    }
+
+    @Documented
+    @Inherited
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.METHOD, ElementType.TYPE})
+    @Feature("Ordering")
+    @interface Ordering {
+    }
 }
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
index f59a9581d..ba96ddd3c 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings({"PMD.ClassNamingConventions", "PMD.LinguisticNaming"})
 public final class AllurePredicates {
 
     private AllurePredicates() {
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
index d0a22173f..a836a04d7 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,6 +20,9 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -32,4 +35,20 @@ public interface AllureResults {
 
     Map<String, byte[]> getAttachments();
 
+    default TestResult getTestResultByName(final String name) {
+        return getTestResults().stream()
+                .filter(tr -> Objects.equals(name, tr.getName()))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException(
+                        "test result with name " + name + " is not found"
+                ));
+    }
+
+    default List<TestResultContainer> getTestResultContainersForTestResult(final TestResult testResult) {
+        return getTestResultContainers().stream()
+                .filter(c -> Objects.nonNull(c.getChildren()))
+                .filter(c -> c.getChildren().contains(testResult.getUuid()))
+                .collect(Collectors.toList());
+    }
+
 }
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
index 0e560c932..cdbfcd85f 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
new file mode 100644
index 000000000..e0e65881b
--- /dev/null
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
@@ -0,0 +1,142 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureConstants;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Locale;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_DEFAULT;
+import static com.fasterxml.jackson.databind.MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class AllureTestCommonsUtils {
+
+    private static final ObjectWriter WRITER = JsonMapper
+            .builder()
+            .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
+            .serializationInclusion(NON_DEFAULT)
+            .build()
+            .registerModule(new SimpleModule()
+                    .addSerializer(Status.class, new StatusSerializer())
+                    .addSerializer(Stage.class, new StageSerializer())
+                    .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
+            )
+            .writerWithDefaultPrettyPrinter();
+
+    private AllureTestCommonsUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    /**
+     * Attach {@link AllureResults} to the report.
+     */
+    public static void attach(final AllureResults allureResults) {
+        allureResults.getTestResults().forEach(testResult -> {
+            try {
+                Allure.addAttachment(
+                        testResult.getUuid() + AllureConstants.TEST_RESULT_FILE_SUFFIX,
+                        WRITER.writeValueAsString(testResult)
+                );
+            } catch (JsonProcessingException e) {
+                throw new UncheckedIOException(e);
+            }
+        });
+
+        allureResults.getTestResultContainers().forEach(container -> {
+            try {
+                Allure.addAttachment(
+                        container.getUuid() + AllureConstants.TEST_RESULT_CONTAINER_FILE_SUFFIX,
+                        WRITER.writeValueAsString(container)
+                );
+            } catch (JsonProcessingException e) {
+                throw new UncheckedIOException(e);
+            }
+        });
+
+        allureResults.getAttachments().forEach((fileName, body) -> Allure
+                .addAttachment(
+                        fileName,
+                        new ByteArrayInputStream(body)
+                )
+        );
+    }
+
+    /**
+     * Parameter mode serializer.
+     */
+    private static class ParameterModeSerializer extends StdSerializer<Parameter.Mode> {
+        protected ParameterModeSerializer() {
+            super(Parameter.Mode.class);
+        }
+
+        @Override
+        public void serialize(final Parameter.Mode value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
+    /**
+     * Stage serializer.
+     */
+    private static class StageSerializer extends StdSerializer<Stage> {
+        protected StageSerializer() {
+            super(Stage.class);
+        }
+
+        @Override
+        public void serialize(final Stage value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
+    /**
+     * Status serializer.
+     */
+    private static class StatusSerializer extends StdSerializer<Status> {
+        protected StatusSerializer() {
+            super(Status.class);
+        }
+
+        @Override
+        public void serialize(final Status value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
+}
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
index 27eae0ccf..3905c64a7 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,12 +17,15 @@
 
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.AllureResultsWriter;
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.ExceptionUtils;
 
 import java.util.UUID;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.getStatus;
@@ -37,8 +40,21 @@ private RunUtils() {
         throw new IllegalStateException("do not instance");
     }
 
-    public static AllureResults runWithinTestContext(final Runnable runnable) {
-        return runWithinTestContext(
+    public static AllureResults runTests(
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
+        return runTests(
+                runnable,
+                Allure::setLifecycle,
+                StepsAspects::setLifecycle,
+                AttachmentsAspects::setLifecycle
+        );
+    }
+
+    public static AllureResults runTests(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
+        return runTests(
+                lifecycleFactory,
                 runnable,
                 Allure::setLifecycle,
                 StepsAspects::setLifecycle,
@@ -47,18 +63,67 @@ public static AllureResults runWithinTestContext(final Runnable runnable) {
     }
 
     @SafeVarargs
-    public static AllureResults runWithinTestContext(final Runnable runnable,
-                                                     final Consumer<AllureLifecycle>... configurers) {
+    public static AllureResults runTests(
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
+            final Consumer<AllureLifecycle>... configurers) {
+        return runTests(AllureLifecycle::new, runnable, configurers);
+    }
+
+    @SafeVarargs
+    public static AllureResults runTests(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
+            final Consumer<AllureLifecycle>... configurers) {
         final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
+        final AllureLifecycle lifecycle = lifecycleFactory.apply(writer);
+
+        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
+        try {
+            Stream.of(configurers).forEach(configurer -> configurer.accept(lifecycle));
+
+            runnable.run(lifecycle);
+
+            return writer;
+        } catch (Throwable e) {
+            throw ExceptionUtils.sneakyThrow(e);
+        } finally {
+            Stream.of(configurers).forEach(configurer -> configurer.accept(defaultLifecycle));
 
+            AllureTestCommonsUtils.attach(writer);
+        }
+    }
+
+    public static AllureResults runWithinTestContext(
+            final Runnable runnable) {
+        return runTests(lifecycle -> withTestContext(runnable, lifecycle));
+    }
+
+    public static AllureResults runWithinTestContext(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Runnable runnable) {
+        return runTests(lifecycleFactory, lifecycle -> withTestContext(runnable, lifecycle));
+    }
+
+    @SafeVarargs
+    public static AllureResults runWithinTestContext(
+            final Runnable runnable,
+            final Consumer<AllureLifecycle>... configurers) {
+        return runTests(lifecycle -> withTestContext(runnable, lifecycle), configurers);
+    }
+
+    @SafeVarargs
+    public static AllureResults runWithinTestContext(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Runnable runnable,
+            final Consumer<AllureLifecycle>... configurers) {
+        return runTests(lifecycleFactory, lifecycle -> withTestContext(runnable, lifecycle), configurers);
+    }
+
+    private static void withTestContext(final Runnable runnable, final AllureLifecycle lifecycle) {
         final String uuid = UUID.randomUUID().toString();
         final TestResult result = new TestResult().setUuid(uuid);
 
-        final AllureLifecycle cached = Allure.getLifecycle();
         try {
-            Stream.of(configurers).forEach(configurer -> configurer.accept(lifecycle));
-
             lifecycle.scheduleTestCase(result);
             lifecycle.startTestCase(uuid);
 
@@ -72,11 +137,7 @@ public static AllureResults runWithinTestContext(final Runnable runnable,
         } finally {
             lifecycle.stopTestCase(uuid);
             lifecycle.writeTestCase(uuid);
-
-            Stream.of(configurers).forEach(configurer -> configurer.accept(cached));
         }
-
-        return writer;
     }
 
 }
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
new file mode 100644
index 000000000..ce23958a4
--- /dev/null
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class TestData {
+
+    private TestData() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static String randomName() {
+        return RandomStringUtils.randomAlphabetic(10);
+    }
+
+    public static String randomId() {
+        return randomString(10);
+    }
+
+    public static String randomString(final int count) {
+        return RandomStringUtils.randomAlphanumeric(count);
+    }
+
+}
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
new file mode 100644
index 000000000..092c183e9
--- /dev/null
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import io.github.benas.randombeans.EnhancedRandomBuilder;
+import io.github.benas.randombeans.api.EnhancedRandom;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class ThreadLocalEnhancedRandom {
+
+    private static final ThreadLocal<EnhancedRandom> INSTANCE = ThreadLocal
+            .withInitial(EnhancedRandomBuilder::aNewEnhancedRandom);
+
+    private ThreadLocalEnhancedRandom() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static EnhancedRandom current() {
+        return INSTANCE.get();
+    }
+
+}
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index 6886a31f5..34a9a2ed3 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -1,17 +1,17 @@
-description = "Allure Java Commons"
+plugins {
+    id("io.github.goooler.shadow")
+}
 
-val agent: Configuration by configurations.creating
+description = "Allure Java Commons"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api("org.slf4j:slf4j-api")
     api(project(":allure-model"))
     compileOnly("org.aspectj:aspectjrt")
-    implementation("com.fasterxml.jackson.core:jackson-databind")
-    implementation("org.apache.tika:tika-core")
-    implementation("org.jooq:joor-java-8")
+    internal("com.fasterxml.jackson.core:jackson-databind")
     testImplementation("io.github.benas:random-beans")
     testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.apache.commons:commons-lang3")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
@@ -22,17 +22,48 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.commons"
-        ))
+configurations.forEach { configuration ->
+    configuration.outgoing.apply {
+        val removed = artifacts.removeAll { it.classifier.isNullOrEmpty() }
+        if (removed) {
+            artifact(tasks.shadowJar) {
+                classifier = ""
+            }
+        }
     }
 }
 
-tasks.test {
-    useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
+tasks {
+    jar {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+
+    shadowJar {
+        archiveClassifier.set("")
+        relocate("com.fasterxml.jackson", "io.qameta.allure.internal.shadowed.jackson")
+        dependencies {
+            include(dependency("com.fasterxml.jackson.core::"))
+        }
+        exclude("**/module-info.class")
+        exclude("META-INF/LICENSE*.md")
+        mergeServiceFiles()
+        manifest {
+            attributes(mapOf(
+                    "Specification-Title" to project.name,
+                    "Implementation-Title" to project.name,
+                    "Implementation-Version" to project.version,
+                    "Automatic-Module-Name" to "io.qameta.allure.commons"
+            ))
+        }
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+
+    test {
+        dependsOn(shadowJar)
+        useJUnitPlatform()
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index 9e494de21..141488990 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@
 /**
  * The class contains some useful methods to work with {@link AllureLifecycle}.
  */
-@SuppressWarnings({"PMD.ClassNamingConventions", "PMD.ExcessivePublicCount", "PMD.TooManyMethods"})
 public final class Allure {
 
     private static final String TXT_EXTENSION = ".txt";
@@ -185,15 +184,14 @@ public static <T> T step(final ThrowableContextRunnable<T, StepContext> runnable
             getLifecycle().updateStep(s -> s
                     .setStatus(getStatus(throwable).orElse(Status.BROKEN))
                     .setStatusDetails(getStatusDetails(throwable).orElse(null)));
-            ExceptionUtils.sneakyThrow(throwable);
-            return null;
+            throw ExceptionUtils.sneakyThrow(throwable);
         } finally {
             getLifecycle().stopStep(uuid);
         }
     }
 
     /**
-     * Adds epic label to current test or step (or fixture) if any. Takes no effect
+     * Adds epic label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -203,7 +201,7 @@ public static void epic(final String value) {
     }
 
     /**
-     * Adds feature label to current test or step (or fixture) if any. Takes no effect
+     * Adds feature label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -213,7 +211,7 @@ public static void feature(final String value) {
     }
 
     /**
-     * Adds story label to current test or step (or fixture) if any. Takes no effect
+     * Adds story label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -223,7 +221,7 @@ public static void story(final String value) {
     }
 
     /**
-     * Adds suite label to current test or step (or fixture) if any. Takes no effect
+     * Adds suite label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -233,7 +231,7 @@ public static void suite(final String value) {
     }
 
     /**
-     * Adds label to current test or step (or fixture) if any. Takes no effect
+     * Adds label to current test if any. Takes no effect
      * if no test run at the moment.
      *
      * @param name  the name of label.
@@ -245,20 +243,68 @@ public static void label(final String name, final String value) {
     }
 
     /**
-     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * Adds parameter to current test if any. Takes no effect
      * if no test run at the moment.
+     * <p>
+     * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
      *
      * @param name  the name of parameter.
      * @param value the value of parameter.
      */
     public static <T> T parameter(final String name, final T value) {
-        final Parameter parameter = createParameter(name, value);
+        return parameter(name, value, null, null);
+    }
+
+    /**
+     * Adds parameter to current test if any. Takes no effect
+     * if no test run at the moment.
+     * <p>
+     * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
+     *
+     * @param name     the name of parameter.
+     * @param value    the value of parameter.
+     * @param excluded true if parameter should be excluded from history key calculation, false otherwise.
+     * @return the specified value.
+     */
+    public static <T> T parameter(final String name, final T value, final Boolean excluded) {
+        return parameter(name, value, excluded, null);
+    }
+
+    /**
+     * Adds parameter to current test if any. Takes no effect
+     * if no test run at the moment.
+     * <p>
+     * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
+     *
+     * @param name  the name of parameter.
+     * @param value the value of parameter.
+     * @param mode  the parameter mode.
+     * @return the specified value.
+     */
+    public static <T> T parameter(final String name, final T value,
+                                  final Parameter.Mode mode) {
+        return parameter(name, value, null, mode);
+    }
+
+    /**
+     * Adds parameter to current test if any. Takes no effect
+     * if no test run at the moment.
+     *
+     * @param name     the name of parameter.
+     * @param value    the value of parameter.
+     * @param excluded true if parameter should be excluded from history key calculation, false otherwise.
+     * @param mode     the parameter mode.
+     * @return the specified value.
+     */
+    public static <T> T parameter(final String name, final T value,
+                                  final Boolean excluded, final Parameter.Mode mode) {
+        final Parameter parameter = createParameter(name, value, excluded, mode);
         getLifecycle().updateTestCase(testResult -> testResult.getParameters().add(parameter));
         return value;
     }
 
     /**
-     * Adds issue link to current test or step (or fixture) if any. Takes no effect
+     * Adds issue link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String, String)}.
      *
      * @param name the name of link.
@@ -269,7 +315,7 @@ public static void issue(final String name, final String url) {
     }
 
     /**
-     * Adds tms link to current test or step (or fixture) if any. Takes no effect
+     * Adds tms link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String, String)}.
      *
      * @param name the name of link.
@@ -280,7 +326,7 @@ public static void tms(final String name, final String url) {
     }
 
     /**
-     * Adds link to current test or step (or fixture) if any. Takes no effect
+     * Adds link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String)}
      *
      * @param url the link's url.
@@ -290,7 +336,7 @@ public static void link(final String url) {
     }
 
     /**
-     * Adds link to current test or step (or fixture) if any. Takes no effect
+     * Adds link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String, String)}
      *
      * @param name the name of link.
@@ -301,7 +347,7 @@ public static void link(final String name, final String url) {
     }
 
     /**
-     * Adds link to current test or step (or fixture) if any. Takes no effect
+     * Adds link to current test if any. Takes no effect
      * if no test run at the moment.
      *
      * @param name the name of link.
@@ -314,7 +360,7 @@ public static void link(final String name, final String type, final String url)
     }
 
     /**
-     * Adds description to current test or step (or fixture) if any. Takes no effect
+     * Adds description to current test if any. Takes no effect
      * if no test run at the moment. Expecting description provided in Markdown format.
      *
      * @param description the description in markdown format.
@@ -325,7 +371,7 @@ public static void description(final String description) {
     }
 
     /**
-     * Adds descriptionHtml to current test or step (or fixture) if any. Takes no effect
+     * Adds descriptionHtml to current test if any. Takes no effect
      * if no test run at the moment. Note that description will take no effect if descriptionHtml is
      * specified.
      *
@@ -406,7 +452,6 @@ public static void addAttachment(final String name, final InputStream content) {
         getLifecycle().addAttachment(name, null, null, content);
     }
 
-    @SuppressWarnings("PMD.UseObjectForClearerAPI")
     public static void addAttachment(final String name, final String type,
                                      final InputStream content, final String fileExtension) {
         getLifecycle().addAttachment(name, type, fileExtension, content);
@@ -485,12 +530,67 @@ public interface ThrowableContextRunnableVoid<T> {
     /**
      * Step context.
      */
+    @SuppressWarnings("MultipleStringLiterals")
     public interface StepContext {
 
+        /**
+         * Sets step's name.
+         *
+         * @param name the deserted name of step.
+         */
         void name(String name);
 
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name  the name of parameter.
+         * @param value the value.
+         * @param <T>   the type of value.
+         * @return the value.
+         */
         <T> T parameter(String name, T value);
 
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name     the name of parameter.
+         * @param value    the value.
+         * @param excluded true if parameter should be excluded from history key generation, false otherwise.
+         * @param <T>      the type of value.
+         * @return the value.
+         */
+        default <T> T parameter(final String name, final T value, final Boolean excluded) {
+            throw new UnsupportedOperationException("method is not implemented");
+        }
+
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name  the name of parameter.
+         * @param value the value.
+         * @param mode  the parameter's mode.
+         * @param <T>   the type of value.
+         * @return the value.
+         */
+        default <T> T parameter(final String name, final T value, final Parameter.Mode mode) {
+            throw new UnsupportedOperationException("method is not implemented");
+        }
+
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name     the name of parameter.
+         * @param value    the value.
+         * @param excluded true if parameter should be excluded from history key generation, false otherwise.
+         * @param mode     the parameter's mode.
+         * @param <T>      the type of value.
+         * @return the value.
+         */
+        default <T> T parameter(final String name, final T value,
+                                final Boolean excluded, final Parameter.Mode mode) {
+            throw new UnsupportedOperationException("method is not implemented");
+        }
+
     }
 
     /**
@@ -511,7 +611,22 @@ public void name(final String name) {
 
         @Override
         public <T> T parameter(final String name, final T value) {
-            final Parameter param = createParameter(name, value);
+            return parameter(name, value, null, null);
+        }
+
+        @Override
+        public <T> T parameter(final String name, final T value, final Boolean excluded) {
+            return parameter(name, value, excluded, null);
+        }
+
+        @Override
+        public <T> T parameter(final String name, final T value, final Parameter.Mode mode) {
+            return parameter(name, value, null, mode);
+        }
+
+        @Override
+        public <T> T parameter(final String name, final T value, final Boolean excluded, final Parameter.Mode mode) {
+            final Parameter param = createParameter(name, value, excluded, mode);
             getLifecycle().updateStep(uuid, stepResult -> stepResult.getParameters().add(param));
             return value;
         }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
index 481e6ae6a..f436de66e 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * @author @author charlie (Dmitry Baev baev@qameta.io)
  * @since 1.0-BETA1
  */
-@SuppressWarnings({"unused", "PMD.ClassNamingConventions"})
+@SuppressWarnings({"unused"})
 public final class AllureConstants {
 
     public static final String TEST_RESULT_FILE_SUFFIX = "-result.json";
@@ -30,18 +30,6 @@ public final class AllureConstants {
 
     public static final String TEST_RESULT_CONTAINER_FILE_GLOB = "*-container.json";
 
-    /**
-     * @deprecated scheduled to remove in 3.0
-     */
-    @Deprecated
-    public static final String TEST_RUN_FILE_SUFFIX = "-testrun.json";
-
-    /**
-     * @deprecated scheduled to remove in 3.0
-     */
-    @Deprecated
-    public static final String TEST_RUN_FILE_GLOB = "*-testrun.json";
-
     public static final String ATTACHMENT_FILE_SUFFIX = "-attachment";
 
     public static final String ATTACHMENT_FILE_GLOB = "*-attachment*";
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
index cd5786aac..3ca5b245a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
index 7af06dd71..b6b6c4fb3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
 /**
  * The class contains Allure context and methods to change it.
  */
-@SuppressWarnings({"PMD.TooManyMethods", "unused"})
+@SuppressWarnings("PMD.AvoidSynchronizedStatement")
 public class AllureLifecycle {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureLifecycle.class);
@@ -596,13 +596,12 @@ public void addAttachment(final String name, final String type,
      * @param fileExtension the attachment file extension
      * @return the source of added attachment
      */
-    @SuppressWarnings({"PMD.NullAssignment", "PMD.UseObjectForClearerAPI"})
     public String prepareAttachment(final String name, final String type, final String fileExtension) {
         final String extension = Optional.ofNullable(fileExtension)
                 .filter(ext -> !ext.isEmpty())
                 .map(ext -> ext.charAt(0) == '.' ? ext : "." + ext)
                 .orElse("");
-        final String source = UUID.randomUUID().toString() + ATTACHMENT_FILE_SUFFIX + extension;
+        final String source = UUID.randomUUID() + ATTACHMENT_FILE_SUFFIX + extension;
 
         final Optional<String> current = threadContext.getCurrent();
         if (!current.isPresent()) {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsReader.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsReader.java
deleted file mode 100644
index a4f22e354..000000000
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsReader.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure;
-
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * @author charlie (Dmitry Baev).
- *
- * @deprecated scheduled to remove in 3.0
- */
-@Deprecated
-public interface AllureResultsReader {
-
-    Stream<TestResult> readTestResults();
-
-    Stream<TestResultContainer> readTestResultsContainers();
-
-    Stream<String> findAllAttachments();
-
-    InputStream readAttachment(String source) throws IOException;
-
-    List<ReadError> getErrors();
-
-}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
index ca3b92180..0dd0b5ef1 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
index e997fd492..9e266b383 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureUtils.java
deleted file mode 100644
index a48951f2c..000000000
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure;
-
-import java.util.UUID;
-
-/**
- * @author charlie (Dmitry Baev).
- * @deprecated scheduled to remove in 3.0.
- */
-@Deprecated
-public final class AllureUtils {
-
-    private AllureUtils() {
-        throw new IllegalStateException("Do not instance");
-    }
-
-    public static String generateTestResultName() {
-        return generateTestResultName(UUID.randomUUID().toString());
-    }
-
-    public static String generateTestResultName(final String uuid) {
-        return uuid + AllureConstants.TEST_RESULT_FILE_SUFFIX;
-    }
-
-    public static String generateTestResultContainerName() {
-        return generateTestResultContainerName(UUID.randomUUID().toString());
-    }
-
-    public static String generateTestResultContainerName(final String uuid) {
-        return uuid + AllureConstants.TEST_RESULT_CONTAINER_FILE_SUFFIX;
-    }
-}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java b/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
index 848ba4f4c..b08ed83ed 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Description.java b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
index a5833befb..3f83f6855 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Description.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import java.lang.annotation.Target;
 
 /**
- *  Annotation that allows to attach a description for a test or for a step.
+ * Annotation that allows to attach a description for a test.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
@@ -39,7 +39,9 @@
      * supports html markdown.
      *
      * @return boolean flag to enable description extraction from javadoc.
+     * @deprecated use {@link Description} without value specified instead.
      */
+    @Deprecated
     boolean useJavaDoc() default false;
 
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Epic.java b/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
index c6515b41e..851c90f56 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Epics.java b/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
index 8e462ca77..2ea16dbdb 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Feature.java b/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
index b340558de..d938062bc 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Features.java b/allure-java-commons/src/main/java/io/qameta/allure/Features.java
index 4c6795e79..8c80d6399 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Features.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Features.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsReader.java b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsReader.java
deleted file mode 100644
index a504eb158..000000000
--- a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsReader.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.qameta.allure.model.Allure2ModelJackson;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static io.qameta.allure.AllureConstants.ATTACHMENT_FILE_GLOB;
-import static io.qameta.allure.AllureConstants.TEST_RESULT_CONTAINER_FILE_GLOB;
-import static io.qameta.allure.AllureConstants.TEST_RESULT_FILE_GLOB;
-import static java.nio.file.Files.newDirectoryStream;
-
-/**
- * @author charlie (Dmitry Baev).
- * @deprecated scheduled to remove in 3.0
- */
-@Deprecated
-public class FileSystemResultsReader implements AllureResultsReader {
-
-    private final Path resultsDirectory;
-
-    private final ObjectMapper mapper;
-
-    private final List<ReadError> errors = new ArrayList<>();
-
-    public FileSystemResultsReader(final Path resultsDirectory) {
-        this.resultsDirectory = resultsDirectory;
-        this.mapper = Allure2ModelJackson.createMapper();
-    }
-
-    @Override
-    public Stream<TestResult> readTestResults() {
-        return listFiles(resultsDirectory, TEST_RESULT_FILE_GLOB)
-                .map(this::readTestResult)
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-    @Override
-    public Stream<TestResultContainer> readTestResultsContainers() {
-        return listFiles(resultsDirectory, TEST_RESULT_CONTAINER_FILE_GLOB)
-                .map(this::readTestResultContainer)
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-    @Override
-    public Stream<String> findAllAttachments() {
-        return listFiles(resultsDirectory, ATTACHMENT_FILE_GLOB)
-                .map(Path::getFileName)
-                .map(Path::toString);
-    }
-
-    @Override
-    public InputStream readAttachment(final String source) throws IOException {
-        return Files.newInputStream(resultsDirectory.resolve(source));
-    }
-
-    @Override
-    public List<ReadError> getErrors() {
-        return errors;
-    }
-
-    private Optional<TestResult> readTestResult(final Path file) {
-        try (InputStream is = Files.newInputStream(file)) {
-            return Optional.ofNullable(mapper.readValue(is, TestResult.class));
-        } catch (IOException e) {
-            errors.add(new ReadError(e, "Could not read result file {}", file));
-            return Optional.empty();
-        }
-    }
-
-    private Optional<TestResultContainer> readTestResultContainer(final Path file) {
-        try (InputStream is = Files.newInputStream(file)) {
-            return Optional.ofNullable(mapper.readValue(is, TestResultContainer.class));
-        } catch (IOException e) {
-            errors.add(new ReadError(e, "Could not read result container file {}", file));
-            return Optional.empty();
-        }
-    }
-
-    private Stream<Path> listFiles(final Path directory, final String glob) {
-        try (DirectoryStream<Path> directoryStream = newDirectoryStream(directory, glob)) {
-            return StreamSupport.stream(directoryStream.spliterator(), false)
-                    .filter(Files::isRegularFile)
-                    .collect(Collectors.toList())
-                    .stream();
-        } catch (IOException e) {
-            errors.add(new ReadError(e, "Could not list files in directory {}", directory));
-            return Stream.empty();
-        }
-    }
-}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
index 3e318ed7e..187f39dc0 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package io.qameta.allure;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.qameta.allure.model.Allure2ModelJackson;
+import io.qameta.allure.internal.Allure2ModelJackson;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java b/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
index 3d6748826..f1fc21733 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Issue.java b/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
index f795897c7..9abe55616 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Issues.java b/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
index 2ab62c75b..c70da23de 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
index 294108077..36a28f031 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
index 8afd77f89..5a63ee889 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Lead.java b/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
index 760f61bc2..30c95c176 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Link.java b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
index b0b4dacb6..d48f8b873 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Link.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
index e646de636..f8ef85974 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
index 50428d1c8..e4df3187a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Links.java b/allure-java-commons/src/main/java/io/qameta/allure/Links.java
index 4e0c977d9..b85c39857 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Links.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Links.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Muted.java b/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
index 16ac6f222..42ab5879a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Owner.java b/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
index d0eea5eb4..cce5b56a2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Param.java b/allure-java-commons/src/main/java/io/qameta/allure/Param.java
new file mode 100644
index 000000000..5c03f1f33
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Param.java
@@ -0,0 +1,71 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure;
+
+import io.qameta.allure.model.Parameter;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation used to add parameters to results
+ * from method parameters.
+ *
+ * @see Parameter
+ * @see Parameter.Mode
+ * @see Allure#parameter(String, Object)
+ */
+@Documented
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface Param {
+
+    /**
+     * Alias for {@link #name()}. Overrides value, specified in {@link #name()}.
+     */
+    String value() default "";
+
+    /**
+     * The name of parameter. Be careful, changing parameter's name
+     * may affect method signature and, as result, may get different
+     * test case generated.
+     * <p>
+     * If not specified, the parameter name from reflection will be used.
+     *
+     * @return the name of parameter.
+     */
+    String name() default "";
+
+    /**
+     * The parameter mode.
+     *
+     * @return the parameter mode.
+     */
+    Parameter.Mode mode() default Parameter.Mode.DEFAULT;
+
+    /**
+     * Set it to true to exclude the parameter from historyKey generation.
+     *
+     * @return true if parameter is excluded, false otherwise.
+     */
+    boolean excluded() default false;
+
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/ReadError.java b/allure-java-commons/src/main/java/io/qameta/allure/ReadError.java
deleted file mode 100644
index 474ea15f6..000000000
--- a/allure-java-commons/src/main/java/io/qameta/allure/ReadError.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure;
-
-import java.util.Objects;
-
-/**
- * @author charlie (Dmitry Baev).
- * @deprecated scheduled to remove in 3.0
- */
-@Deprecated
-public class ReadError {
-
-    private final String message;
-
-    private final Throwable exception;
-
-    public ReadError(final Throwable exception, final String message, final Object... args) {
-        this.message = Objects.nonNull(args) ? String.format(message, args) : message;
-        this.exception = exception;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public Throwable getException() {
-        return exception;
-    }
-}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Severity.java b/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
index 767bc0b90..d34ca0e26 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java b/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
index eb8e3a0b6..ad7bcd152 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Step.java b/allure-java-commons/src/main/java/io/qameta/allure/Step.java
index 1fec2ab71..2ddcc2e33 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Step.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Step.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Stories.java b/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
index e9f376d94..9e990597c 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Story.java b/allure-java-commons/src/main/java/io/qameta/allure/Story.java
index bf74c5ceb..929485db8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Story.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Story.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java b/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
index d5e839017..f4f3b68d2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java b/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
index 1253436b4..f364bab76 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
index 617eae770..02b4ac000 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
index 407c82d40..965a93814 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
new file mode 100644
index 000000000..765aa1421
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
@@ -0,0 +1,109 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.internal;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+import static com.fasterxml.jackson.databind.MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME;
+import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+
+/**
+ * The type Allure 2 model jackson.
+ *
+ * @author baev (Dmitry Baev).
+ */
+public final class Allure2ModelJackson {
+
+    public static final String INDENT_OUTPUT_PROPERTY_NAME = "allure.results.indentOutput";
+
+    private Allure2ModelJackson() {
+        throw new IllegalStateException("Do not instance Allure2ModelJackson");
+    }
+
+    public static ObjectMapper createMapper() {
+        return JsonMapper
+                .builder()
+                .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
+                .serializationInclusion(NON_NULL)
+                .configure(INDENT_OUTPUT, Boolean.getBoolean(INDENT_OUTPUT_PROPERTY_NAME))
+                .build()
+                .registerModule(new SimpleModule()
+                        .addSerializer(Status.class, new StatusSerializer())
+                        .addSerializer(Stage.class, new StageSerializer())
+                        .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
+                );
+    }
+
+    /**
+     * Parameter mode serializer.
+     */
+    private static class ParameterModeSerializer extends StdSerializer<Parameter.Mode> {
+        protected ParameterModeSerializer() {
+            super(Parameter.Mode.class);
+        }
+
+        @Override
+        public void serialize(final Parameter.Mode value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
+    /**
+     * Stage serializer.
+     */
+    private static class StageSerializer extends StdSerializer<Stage> {
+        protected StageSerializer() {
+            super(Stage.class);
+        }
+
+        @Override
+        public void serialize(final Stage value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
+    /**
+     * Status serializer.
+     */
+    private static class StatusSerializer extends StdSerializer<Status> {
+        protected StatusSerializer() {
+            super(Status.class);
+        }
+
+        @Override
+        public void serialize(final Status value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
index a72614684..3f1c72392 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -55,9 +55,9 @@ public Optional<StepResult> getStep(final String uuid) {
     }
 
     public <T> Optional<T> get(final String uuid, final Class<T> clazz) {
+        Objects.requireNonNull(uuid, "Can't get item from storage: uuid can't be null");
         lock.readLock().lock();
         try {
-            Objects.requireNonNull(uuid, "Can't get item from storage: uuid can't be null");
             return Optional.ofNullable(storage.get(uuid))
                     .filter(clazz::isInstance)
                     .map(clazz::cast);
@@ -67,9 +67,9 @@ public <T> Optional<T> get(final String uuid, final Class<T> clazz) {
     }
 
     public <T> T put(final String uuid, final T item) {
+        Objects.requireNonNull(uuid, "Can't put item to storage: uuid can't be null");
         lock.writeLock().lock();
         try {
-            Objects.requireNonNull(uuid, "Can't put item to storage: uuid can't be null");
             storage.put(uuid, item);
             return item;
         } finally {
@@ -78,9 +78,9 @@ public <T> T put(final String uuid, final T item) {
     }
 
     public void remove(final String uuid) {
+        Objects.requireNonNull(uuid, "Can't remove item from storage: uuid can't be null");
         lock.writeLock().lock();
         try {
-            Objects.requireNonNull(uuid, "Can't remove item from storage: uuid can't be null");
             storage.remove(uuid);
         } finally {
             lock.writeLock().unlock();
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
index cc7236a79..e052c8d11 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.qameta.allure.internal;
 
+import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,7 +33,7 @@ public class AllureThreadContext {
      * Returns last (most recent) uuid.
      */
     public Optional<String> getCurrent() {
-        final LinkedList<String> uuids = context.get();
+        final Deque<String> uuids = context.get();
         return uuids.isEmpty()
                 ? Optional.empty()
                 : Optional.of(uuids.getFirst());
@@ -42,7 +43,7 @@ public Optional<String> getCurrent() {
      * Returns first (oldest) uuid.
      */
     public Optional<String> getRoot() {
-        final LinkedList<String> uuids = context.get();
+        final Deque<String> uuids = context.get();
         return uuids.isEmpty()
                 ? Optional.empty()
                 : Optional.of(uuids.getLast());
@@ -62,7 +63,7 @@ public void start(final String uuid) {
      * @return removed uuid.
      */
     public Optional<String> stop() {
-        final LinkedList<String> uuids = context.get();
+        final Deque<String> uuids = context.get();
         if (!uuids.isEmpty()) {
             return Optional.of(uuids.pop());
         }
@@ -79,15 +80,15 @@ public void clear() {
     /**
      * Thread local context that stores information about not finished tests and steps.
      */
-    private static class Context extends InheritableThreadLocal<LinkedList<String>> {
+    private static final class Context extends InheritableThreadLocal<Deque<String>> {
 
         @Override
-        public LinkedList<String> initialValue() {
+        public Deque<String> initialValue() {
             return new LinkedList<>();
         }
 
         @Override
-        protected LinkedList<String> childValue(final LinkedList<String> parentStepContext) {
+        protected Deque<String> childValue(final Deque<String> parentStepContext) {
             return new LinkedList<>(parentStepContext);
         }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
index 6f8ae0ff3..e8cca6af8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,35 +24,35 @@
  */
 public interface ContainerLifecycleListener extends LifecycleListener {
 
-    default void beforeContainerStart(TestResultContainer container) {
+    default void beforeContainerStart(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerStart(TestResultContainer container) {
+    default void afterContainerStart(final TestResultContainer container) {
         //do nothing
     }
 
-    default void beforeContainerUpdate(TestResultContainer container) {
+    default void beforeContainerUpdate(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerUpdate(TestResultContainer container) {
+    default void afterContainerUpdate(final TestResultContainer container) {
         //do nothing
     }
 
-    default void beforeContainerStop(TestResultContainer container) {
+    default void beforeContainerStop(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerStop(TestResultContainer container) {
+    default void afterContainerStop(final TestResultContainer container) {
         //do nothing
     }
 
-    default void beforeContainerWrite(TestResultContainer container) {
+    default void beforeContainerWrite(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerWrite(TestResultContainer container) {
+    default void afterContainerWrite(final TestResultContainer container) {
         //do nothing
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
index 544c5f2d8..39296505a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,27 +24,27 @@
  */
 public interface FixtureLifecycleListener extends LifecycleListener {
 
-    default void beforeFixtureStart(FixtureResult result) {
+    default void beforeFixtureStart(final FixtureResult result) {
         //do nothing
     }
 
-    default void afterFixtureStart(FixtureResult result) {
+    default void afterFixtureStart(final FixtureResult result) {
         //do nothing
     }
 
-    default void beforeFixtureUpdate(FixtureResult result) {
+    default void beforeFixtureUpdate(final FixtureResult result) {
         //do nothing
     }
 
-    default void afterFixtureUpdate(FixtureResult result) {
+    default void afterFixtureUpdate(final FixtureResult result) {
         //do nothing
     }
 
-    default void beforeFixtureStop(FixtureResult result) {
+    default void beforeFixtureStop(final FixtureResult result) {
         //do nothing
     }
 
-    default void afterFixtureStop(FixtureResult result) {
+    default void afterFixtureStop(final FixtureResult result) {
         //do nothing
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
index b6930873b..b411081f2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
index 92f56097a..d082a4bc3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 /**
  * @since 2.0
  */
-@SuppressWarnings("PMD.TooManyMethods")
 public class LifecycleNotifier implements ContainerLifecycleListener,
         TestLifecycleListener, FixtureLifecycleListener, StepLifecycleListener {
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
index b943f2f5c..e304beab3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,27 +24,27 @@
  */
 public interface StepLifecycleListener extends LifecycleListener {
 
-    default void beforeStepStart(StepResult result) {
+    default void beforeStepStart(final StepResult result) {
         //do nothing
     }
 
-    default void afterStepStart(StepResult result) {
+    default void afterStepStart(final StepResult result) {
         //do nothing
     }
 
-    default void beforeStepUpdate(StepResult result) {
+    default void beforeStepUpdate(final StepResult result) {
         //do nothing
     }
 
-    default void afterStepUpdate(StepResult result) {
+    default void afterStepUpdate(final StepResult result) {
         //do nothing
     }
 
-    default void beforeStepStop(StepResult result) {
+    default void beforeStepStop(final StepResult result) {
         //do nothing
     }
 
-    default void afterStepStop(StepResult result) {
+    default void afterStepStop(final StepResult result) {
         //do nothing
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
index 0005a4776..bed90719b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,43 +24,43 @@
  */
 public interface TestLifecycleListener extends LifecycleListener {
 
-    default void beforeTestSchedule(TestResult result) {
+    default void beforeTestSchedule(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestSchedule(TestResult result) {
+    default void afterTestSchedule(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestUpdate(TestResult result) {
+    default void beforeTestUpdate(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestUpdate(TestResult result) {
+    default void afterTestUpdate(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestStart(TestResult result) {
+    default void beforeTestStart(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestStart(TestResult result) {
+    default void afterTestStart(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestStop(TestResult result) {
+    default void beforeTestStop(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestStop(TestResult result) {
+    default void afterTestStop(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestWrite(TestResult result) {
+    default void beforeTestWrite(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestWrite(TestResult result) {
+    default void afterTestWrite(final TestResult result) {
         //do nothing
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
index 906c505a5..efc966051 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,8 +15,10 @@
  */
 package io.qameta.allure.util;
 
+import io.qameta.allure.Flaky;
 import io.qameta.allure.LabelAnnotation;
 import io.qameta.allure.LinkAnnotation;
+import io.qameta.allure.Muted;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import org.slf4j.Logger;
@@ -55,6 +57,26 @@ private AnnotationUtils() {
         throw new IllegalStateException("Do not instance");
     }
 
+    /**
+     * Returns true if {@link io.qameta.allure.Flaky} annotation is present.
+     *
+     * @param annotatedElement the element to search annotations on.
+     * @return true if {@link io.qameta.allure.Flaky} annotation is present, false otherwise.
+     */
+    public static boolean isFlaky(final AnnotatedElement annotatedElement) {
+        return annotatedElement.isAnnotationPresent(Flaky.class);
+    }
+
+    /**
+     * Returns true if {@link io.qameta.allure.Muted} annotation is present.
+     *
+     * @param annotatedElement the element to search annotations on.
+     * @return true if {@link io.qameta.allure.Muted} annotation is present, false otherwise.
+     */
+    public static boolean isMuted(final AnnotatedElement annotatedElement) {
+        return annotatedElement.isAnnotationPresent(Muted.class);
+    }
+
     /**
      * Returns links created from Allure meta annotations specified on annotated element.
      *
@@ -62,7 +84,7 @@ private AnnotationUtils() {
      * @return discovered links.
      */
     public static Set<Link> getLinks(final AnnotatedElement annotatedElement) {
-        return getLinks(annotatedElement.getDeclaredAnnotations());
+        return getLinks(annotatedElement.getAnnotations());
     }
 
     /**
@@ -94,7 +116,7 @@ public static Set<Link> getLinks(final Collection<Annotation> annotations) {
      * @return discovered labels.
      */
     public static Set<Label> getLabels(final AnnotatedElement annotatedElement) {
-        return getLabels(annotatedElement.getDeclaredAnnotations());
+        return getLabels(annotatedElement.getAnnotations());
     }
 
     /**
@@ -184,8 +206,6 @@ private static Stream<String> callValueMethod(final Annotation annotation) {
     @SuppressWarnings({
             "CyclomaticComplexity",
             "ReturnCount",
-            "PMD.NcssCount",
-            "PMD.CyclomaticComplexity"
     })
     private static Stream<String> objectToStringStream(final Object object) {
         if (Objects.nonNull(object) && object.getClass().isArray()) {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
index 98c83e7b6..ea6396924 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.qameta.allure.util;
 
+import io.qameta.allure.Param;
 import io.qameta.allure.model.Parameter;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
@@ -25,6 +26,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.util.NamingUtils.processNameTemplate;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
@@ -38,19 +40,6 @@ private AspectUtils() {
         throw new IllegalStateException("Do not instance");
     }
 
-    /**
-     * @deprecated use {@link AspectUtils#getName(String,JoinPoint)} instead.
-     */
-    @Deprecated
-    public static String getName(final String nameTemplate,
-                                 final MethodSignature methodSignature,
-                                 final Object... args) {
-        return Optional.of(nameTemplate)
-                .filter(v -> !v.isEmpty())
-                .map(value -> processNameTemplate(value, getParametersMap(methodSignature, args)))
-                .orElseGet(methodSignature::getName);
-    }
-
     public static String getName(final String nameTemplate, final JoinPoint joinPoint) {
         return Optional.of(nameTemplate)
                 .filter(v -> !v.isEmpty())
@@ -81,9 +70,26 @@ public static Map<String, Object> getParametersMap(final JoinPoint joinPoint) {
     }
 
     public static List<Parameter> getParameters(final MethodSignature signature, final Object... args) {
+        final java.lang.reflect.Parameter[] params = signature.getMethod().getParameters();
         return IntStream
                 .range(0, args.length)
-                .mapToObj(index -> createParameter(signature.getParameterNames()[index], args[index]))
+                .mapToObj(index -> {
+                    final Parameter parameter = createParameter(signature.getParameterNames()[index], args[index]);
+                    final java.lang.reflect.Parameter ref = params[index];
+                    Stream.of(ref.getAnnotationsByType(Param.class))
+                            .findFirst()
+                            .ifPresent(param -> {
+                                Stream.of(param.value(), param.name())
+                                        .map(String::trim)
+                                        .filter(name -> name.length() > 0)
+                                        .findFirst()
+                                        .ifPresent(parameter::setName);
+
+                                parameter.setMode(param.mode());
+                                parameter.setExcluded(param.excluded());
+                            });
+                    return parameter;
+                })
                 .collect(Collectors.toList());
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
index 4764b04f2..f644cf7e7 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ private ExceptionUtils() {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T extends Throwable> void sneakyThrow(final Throwable throwable) throws T {
+    public static <T extends Throwable> T sneakyThrow(final Throwable throwable) throws T {
         throw (T) throwable;
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
index 716d6595f..5b68c1d0d 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -29,8 +30,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import static org.joor.Reflect.on;
-
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -88,9 +87,49 @@ private static String extractProperties(final Object object, final String[] part
                         .map(child -> extractProperties(child, parts, index))
                         .collect(JOINER);
             }
-            final Object child = on(object).get(parts[index]);
+            final Object child = extractChild(object, parts[index]);
             return extractProperties(child, parts, index + 1);
         }
         return ObjectUtils.toString(object);
     }
+
+    private static Object extractChild(final Object object, final String part) {
+        final Class<?> type = object == null ? Object.class : object.getClass();
+        try {
+            return extractField(object, part, type);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException("Unable to extract " + part + " value from " + type.getName(), e);
+        }
+    }
+
+    @SuppressWarnings("PMD.EmptyCatchBlock")
+    private static Object extractField(final Object object, final String part, final Class<?> type)
+            throws ReflectiveOperationException {
+        try {
+            final Field field = type.getField(part);
+            return fieldValue(object, field);
+        } catch (NoSuchFieldException e) {
+            Class<?> t = type;
+            while (t != null) {
+                try {
+                    final Field declaredField = t.getDeclaredField(part);
+                    return fieldValue(object, declaredField);
+                } catch (NoSuchFieldException ignore) {
+                    // Ignore
+                }
+                t = t.getSuperclass();
+            }
+            throw e;
+        }
+    }
+
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
+    private static Object fieldValue(final Object object, final Field field) throws IllegalAccessException {
+        try {
+            return field.get(object);
+        } catch (IllegalAccessException e) {
+            field.setAccessible(true);
+            return field.get(object);
+        }
+    }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
index 6f8de03b9..e38c7f361 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -44,8 +46,6 @@ private ObjectUtils() {
     @SuppressWarnings({
             "CyclomaticComplexity",
             "ReturnCount",
-            "PMD.NcssCount",
-            "PMD.CyclomaticComplexity"
     })
     public static String toString(final Object object) {
         try {
@@ -76,4 +76,14 @@ public static String toString(final Object object) {
             return "<NPE>";
         }
     }
+
+    public static String mapToString(final Map<String, String> map) {
+        if (map == null || map.isEmpty()) {
+            return "{}";
+        }
+        return map.keySet()
+                .stream()
+                .map(key -> key + "=" + map.get(key))
+                .collect(Collectors.joining(",", "{", "}"));
+    }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
new file mode 100644
index 000000000..2cb2687c9
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
@@ -0,0 +1,64 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.util;
+
+import io.qameta.allure.Param;
+import io.qameta.allure.model.Parameter;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class ParameterUtils {
+
+    private ParameterUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static List<Parameter> createParameters(final Method method,
+                                                   final Object... args) {
+        final java.lang.reflect.Parameter[] parameters = method.getParameters();
+        return IntStream.range(0, parameters.length)
+                .mapToObj(i -> {
+                    final java.lang.reflect.Parameter parameter = parameters[i];
+                    final Object value = args[i];
+                    final Param annotation = parameter.getAnnotation(Param.class);
+                    if (Objects.isNull(annotation)) {
+                        return ResultsUtils.createParameter(parameter.getName(), value);
+                    }
+                    final String name = Stream.of(annotation.value(), annotation.name(), parameter.getName())
+                            .map(String::trim)
+                            .filter(s -> s.length() > 0)
+                            .findFirst()
+                            .orElseGet(() -> "arg" + i);
+
+                    return ResultsUtils.createParameter(
+                            name,
+                            value,
+                            annotation.excluded(),
+                            annotation.mode()
+                    );
+                })
+                .collect(Collectors.toList());
+    }
+
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
index cd8b4d657..da96fe87b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index b3a4beb88..3c9a2cfb8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,10 +27,10 @@
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
-import org.apache.tika.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -48,6 +48,7 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -60,10 +61,7 @@
  */
 @SuppressWarnings({
         "ClassFanOutComplexity",
-        "PMD.ExcessiveImports",
-        "PMD.TooManyMethods",
-        "PMD.GodClass",
-        "deprecation"
+        "ClassDataAbstractionCoupling",
 })
 public final class ResultsUtils {
 
@@ -97,7 +95,7 @@ public final class ResultsUtils {
     public static final String LANGUAGE_LABEL_NAME = "language";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResultsUtils.class);
-    private static final String ALLURE_DESCRIPTIONS_PACKAGE = "allureDescriptions/";
+    private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
     private static final String MD_5 = "MD5";
 
     private static String cachedHost;
@@ -107,7 +105,16 @@ private ResultsUtils() {
     }
 
     public static Parameter createParameter(final String name, final Object value) {
-        return new Parameter().setName(name).setValue(ObjectUtils.toString(value));
+        return createParameter(name, value, null, null);
+    }
+
+    public static Parameter createParameter(final String name, final Object value,
+                                            final Boolean excluded, final Parameter.Mode mode) {
+        return new Parameter()
+                .setName(name)
+                .setValue(ObjectUtils.toString(value))
+                .setExcluded(excluded)
+                .setMode(mode);
     }
 
     public static Label createSuiteLabel(final String suite) {
@@ -276,8 +283,12 @@ public static Optional<Status> getStatus(final Throwable throwable) {
     public static Optional<StatusDetails> getStatusDetails(final Throwable e) {
         return Optional.ofNullable(e)
                 .map(throwable -> new StatusDetails()
-                        .setMessage(Optional.ofNullable(throwable.getMessage()).orElse(throwable.getClass().getName()))
-                        .setTrace(getStackTraceAsString(throwable)));
+                        .setMessage(Optional
+                                .ofNullable(throwable.getMessage())
+                                .orElse(throwable.getClass().getName())
+                        )
+                        .setTrace(getStackTraceAsString(throwable))
+                );
     }
 
     public static Optional<String> getJavadocDescription(final ClassLoader classLoader,
@@ -292,7 +303,7 @@ public static Optional<String> getJavadocDescription(final ClassLoader classLoad
                 name,
                 parameterTypes);
 
-        return readResource(classLoader, ALLURE_DESCRIPTIONS_PACKAGE + signatureHash)
+        return readResource(classLoader, ALLURE_DESCRIPTIONS_FOLDER + signatureHash)
                 .map(desc -> separateLines() ? desc.replace("\n", "<br />") : desc);
     }
 
@@ -351,7 +362,7 @@ private static String getRealHostName() {
             try {
                 cachedHost = InetAddress.getLocalHost().getHostName();
             } catch (UnknownHostException e) {
-                LOGGER.debug("Could not get host name {}", e);
+                LOGGER.debug("Could not get host name", e);
                 cachedHost = "default";
             }
         }
@@ -371,20 +382,18 @@ private static String getStackTraceAsString(final Throwable throwable) {
         return stringWriter.toString();
     }
 
-    /**
-     * @deprecated use {@link #getJavadocDescription(ClassLoader, Method)} instead.
-     */
-    @Deprecated
     public static void processDescription(final ClassLoader classLoader,
                                           final Method method,
-                                          final io.qameta.allure.model.ExecutableItem item) {
+                                          final Consumer<String> setDescription,
+                                          final Consumer<String> setDescriptionHtml) {
         if (method.isAnnotationPresent(Description.class)) {
-            if (method.getAnnotation(Description.class).useJavaDoc()) {
+            final Description annotation = method.getAnnotation(Description.class);
+            if ("".equals(annotation.value())) {
                 getJavadocDescription(classLoader, method)
-                        .ifPresent(item::setDescriptionHtml);
+                        .ifPresent(setDescriptionHtml);
             } else {
-                final String description = method.getAnnotation(Description.class).value();
-                item.setDescription(description);
+                final String description = annotation.value();
+                setDescription.accept(description);
             }
         }
     }
@@ -394,7 +403,7 @@ private static Optional<String> readResource(final ClassLoader classLoader, fina
             if (Objects.isNull(is)) {
                 return Optional.empty();
             }
-            final byte[] bytes = IOUtils.toByteArray(is);
+            final byte[] bytes = toBytes(is);
             return Optional.of(new String(bytes, StandardCharsets.UTF_8));
         } catch (IOException e) {
             LOGGER.warn("Unable to process description resource file", e);
@@ -402,6 +411,19 @@ private static Optional<String> readResource(final ClassLoader classLoader, fina
         return Optional.empty();
     }
 
+    private static byte[] toBytes(final InputStream is) throws IOException {
+        final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        final byte[] buffer = new byte[4096];
+        int n;
+        do {
+            n = is.read(buffer);
+            if (n > 0) {
+                output.write(buffer, 0, n);
+            }
+        } while (-1 != n);
+        return output.toByteArray();
+    }
+
     private static boolean separateLines() {
         return parseBoolean(loadAllureProperties().getProperty(ALLURE_SEPARATE_LINES_SYSPROP));
     }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
index 64d09f047..c6ff3c5b9 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
index 4d86ddc06..bd2c079b7 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -34,7 +35,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.UUID;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -45,9 +46,10 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static io.github.benas.randombeans.api.EnhancedRandom.random;
 import static io.qameta.allure.Allure.addStreamAttachmentAsync;
-import static io.qameta.allure.Allure.setLifecycle;
+import static io.qameta.allure.test.TestData.randomId;
+import static io.qameta.allure.test.TestData.randomName;
+import static io.qameta.allure.test.TestData.randomString;
 import static java.util.concurrent.CompletableFuture.allOf;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
@@ -69,10 +71,27 @@ public void setUp() {
         lifecycle = new AllureLifecycle(writer);
     }
 
+    @Test
+    void shouldReturnCurrentTestCaseId() {
+        final String uuid = randomId();
+        final String name = randomName();
+        final TestResult result = new TestResult().setUuid(uuid).setName(name);
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestCase(uuid);
+
+        final String stepUuid = randomId();
+        lifecycle.startStep(uuid, stepUuid, new StepResult().setName(randomName()));
+
+        final Optional<String> currentTestCase = lifecycle.getCurrentTestCase();
+        assertThat(currentTestCase)
+                .isPresent()
+                .hasValue(uuid);
+    }
+
     @Test
     void shouldCreateTest() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final TestResult result = new TestResult().setUuid(uuid).setName(name);
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestCase(uuid);
@@ -90,8 +109,8 @@ void shouldCreateTest() {
 
     @Test
     void shouldCreateTestContainer() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final TestResultContainer container = new TestResultContainer()
                 .setUuid(uuid)
                 .setName(name);
@@ -111,15 +130,15 @@ void shouldCreateTestContainer() {
 
     @Test
     void shouldCreateChildTestContainer() {
-        final String parentUuid = random(String.class);
-        final String parentName = random(String.class);
+        final String parentUuid = randomId();
+        final String parentName = randomName();
         final TestResultContainer parent = new TestResultContainer()
                 .setUuid(parentUuid)
                 .setName(parentName);
         lifecycle.startTestContainer(parent);
 
-        final String childUuid = random(String.class);
-        final String childName = random(String.class);
+        final String childUuid = randomId();
+        final String childName = randomName();
         final TestResultContainer container = new TestResultContainer()
                 .setUuid(childUuid)
                 .setName(childName);
@@ -155,8 +174,8 @@ void shouldCreateChildTestContainer() {
 
     @Test
     void shouldAddStepsToTests() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final TestResult result = new TestResult().setUuid(uuid).setName(name);
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestCase(uuid);
@@ -183,21 +202,21 @@ void shouldAddStepsToTests() {
 
     @Test
     void shouldUpdateTest() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
 
         final TestResult result = new TestResult().setUuid(uuid).setName(name);
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestCase(uuid);
 
-        final String stepUuid = random(String.class);
-        final String stepName = random(String.class);
+        final String stepUuid = randomId();
+        final String stepName = randomName();
 
         final StepResult step = new StepResult().setName(stepName);
         lifecycle.startStep(uuid, stepUuid, step);
 
-        final String description = random(String.class);
-        final String fullName = random(String.class);
+        final String description = randomName();
+        final String fullName = randomName();
 
         lifecycle.updateTestCase(uuid, testResult -> testResult.setDescription(description));
         lifecycle.updateTestCase(testResult -> testResult.setFullName(fullName));
@@ -225,9 +244,9 @@ void shouldUpdateTest() {
 
     @Test
     void shouldUpdateContainer() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
-        final String newName = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
+        final String newName = randomName();
 
         final TestResultContainer container = new TestResultContainer()
                 .setUuid(uuid)
@@ -249,16 +268,16 @@ void shouldUpdateContainer() {
 
     @Test
     void shouldCreateTestFixture() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
 
         TestResultContainer container = new TestResultContainer()
                 .setUuid(uuid)
                 .setName(name);
         lifecycle.startTestContainer(container);
 
-        final String firstUuid = random(String.class);
-        final String firstName = random(String.class);
+        final String firstUuid = randomId();
+        final String firstName = randomName();
         final FixtureResult first = new FixtureResult().setName(firstName);
 
         lifecycle.startPrepareFixture(uuid, firstUuid, first);
@@ -294,36 +313,24 @@ void shouldCreateTestFixture() {
                 .containsExactly(firstStepName, secondStepName);
     }
 
-    @SuppressWarnings("OptionalGetWithoutIsPresent")
     @Test
     void shouldAttachAsync() {
         final List<CompletableFuture<InputStream>> features = new CopyOnWriteArrayList<>();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        setLifecycle(lifecycle);
 
-        final String uuid = UUID.randomUUID().toString();
-        final TestResult result = new TestResult().setUuid(uuid);
+        final String attachment1Name = randomName();
+        final String attachment2Name = randomName();
 
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestCase(uuid);
-
-        final String attachment1Content = random(String.class);
-        final String attachment2Content = random(String.class);
+        final String attachment1Content = randomString(100);
+        final String attachment2Content = randomString(100);
 
-        final String attachment1Name = random(String.class);
-        final String attachment2Name = random(String.class);
+        final AllureResults writer = RunUtils.runWithinTestContext(() -> {
+            features.add(addStreamAttachmentAsync(
+                    attachment1Name, "video/mp4", getStreamWithTimeout(2, attachment1Content)));
+            features.add(addStreamAttachmentAsync(
+                    attachment2Name, "text/plain", getStreamWithTimeout(1, attachment2Content)));
 
-        features.add(addStreamAttachmentAsync(
-                attachment1Name, "video/mp4", getStreamWithTimeout(2, attachment1Content)));
-        features.add(addStreamAttachmentAsync(
-                attachment2Name, "text/plain", getStreamWithTimeout(1, attachment2Content)));
-
-        lifecycle.stopTestCase(uuid);
-        lifecycle.writeTestCase(uuid);
-
-        allOf(features.toArray(new CompletableFuture[0])).join();
+            allOf(features.toArray(new CompletableFuture[0])).join();
+        });
 
         final List<io.qameta.allure.model.Attachment> attachments = writer.getTestResults().stream()
                 .map(TestResult::getAttachments)
@@ -337,6 +344,10 @@ void shouldAttachAsync() {
                         tuple(attachment2Name, "text/plain")
                 );
 
+        assertThat(attachments)
+                .extracting(io.qameta.allure.model.Attachment::getSize)
+                .containsOnlyNulls();
+
         final String[] sources = attachments.stream()
                 .map(io.qameta.allure.model.Attachment::getSource)
                 .toArray(String[]::new);
@@ -349,7 +360,7 @@ void shouldAttachAsync() {
         final io.qameta.allure.model.Attachment attachment1 = attachments.stream()
                 .filter(attachment -> Objects.equals(attachment.getName(), attachment1Name))
                 .findAny()
-                .get();
+                .orElseThrow();
 
         final byte[] actual1 = attachmentFiles.get(attachment1.getSource());
 
@@ -359,7 +370,7 @@ void shouldAttachAsync() {
         final Attachment attachment2 = attachments.stream()
                 .filter(attachment -> Objects.equals(attachment.getName(), attachment2Name))
                 .findAny()
-                .get();
+                .orElseThrow();
 
         final byte[] actual2 = attachmentFiles.get(attachment2.getSource());
 
@@ -381,8 +392,8 @@ private Supplier<InputStream> getStreamWithTimeout(final long delay, final Strin
 
     @Test
     void supportForConcurrentUseOfChildThreads() throws Exception {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
 
         final int threads = 20;
         final int stepsCount = 1000;
@@ -446,8 +457,8 @@ void supportForConcurrentUseOfChildThreads() throws Exception {
     }
 
     private String randomStep(String parentUuid) {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final StepResult step = new StepResult().setName(name);
         lifecycle.startStep(parentUuid, uuid, step);
         lifecycle.stopStep(uuid);
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
index 53c2f81bd..a4b8afa51 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import static io.github.benas.randombeans.api.EnhancedRandom.random;
 import static io.qameta.allure.Allure.attachment;
 import static io.qameta.allure.Allure.description;
 import static io.qameta.allure.Allure.descriptionHtml;
@@ -43,6 +42,8 @@
 import static io.qameta.allure.Allure.step;
 import static io.qameta.allure.Allure.tms;
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static io.qameta.allure.test.TestData.randomName;
+import static io.qameta.allure.test.ThreadLocalEnhancedRandom.current;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -140,9 +141,9 @@ void shouldHideCheckedExceptions() {
 
     @Test
     void shouldAddLabels() {
-        final Label first = random(Label.class);
-        final Label second = random(Label.class);
-        final Label third = random(Label.class);
+        final Label first = current().nextObject(Label.class);
+        final Label second = current().nextObject(Label.class);
+        final Label third = current().nextObject(Label.class);
 
         final AllureResults results = runWithinTestContext(
                 () -> getLifecycle().updateTestCase(testResult -> testResult.getLabels().addAll(asList(first, second, third))),
@@ -156,9 +157,9 @@ void shouldAddLabels() {
 
     @Test
     void shouldAddParameter() {
-        final Parameter first = random(Parameter.class);
-        final Parameter second = random(Parameter.class);
-        final Parameter third = random(Parameter.class);
+        final Parameter first = current().nextObject(Parameter.class);
+        final Parameter second = current().nextObject(Parameter.class);
+        final Parameter third = current().nextObject(Parameter.class);
 
         final AllureResults results = runWithinTestContext(
                 () -> {
@@ -179,11 +180,36 @@ void shouldAddParameter() {
                 );
     }
 
+    @Test
+    void shouldAddParameterWithModeAndExcluded() {
+        final Parameter first = current().nextObject(Parameter.class);
+        final Parameter second = current().nextObject(Parameter.class);
+        final Parameter third = current().nextObject(Parameter.class);
+
+        final AllureResults results = runWithinTestContext(
+                () -> {
+                    parameter(first.getName(), first.getValue(), first.getMode());
+                    parameter(second.getName(), second.getValue(), second.getExcluded());
+                    parameter(third.getName(), third.getValue(), third.getExcluded(), third.getMode());
+                },
+                Allure::setLifecycle
+        );
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getExcluded, Parameter::getMode)
+                .contains(
+                        tuple(first.getName(), first.getValue(), null, first.getMode()),
+                        tuple(second.getName(), second.getValue(), second.getExcluded(), null),
+                        tuple(third.getName(), third.getValue(), third.getExcluded(), third.getMode())
+                );
+    }
+
     @Test
     void shouldAddLinks() {
-        final io.qameta.allure.model.Link first = random(Link.class);
-        final io.qameta.allure.model.Link second = random(Link.class);
-        final io.qameta.allure.model.Link third = random(Link.class);
+        final io.qameta.allure.model.Link first = current().nextObject(Link.class);
+        final io.qameta.allure.model.Link second = current().nextObject(Link.class);
+        final io.qameta.allure.model.Link third = current().nextObject(Link.class);
 
         final AllureResults results = runWithinTestContext(
                 () -> {
@@ -206,7 +232,7 @@ void shouldAddLinks() {
 
     @Test
     void shouldAddDescription() {
-        final String description = random(String.class);
+        final String description = randomName();
 
         final AllureResults results = runWithinTestContext(
                 () -> description(description),
@@ -220,7 +246,7 @@ void shouldAddDescription() {
 
     @Test
     void shouldAddDescriptionHtml() {
-        final String descriptionHtml = random(String.class);
+        final String descriptionHtml = randomName();
 
         final AllureResults results = runWithinTestContext(
                 () -> descriptionHtml(descriptionHtml),
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
index 667f17285..d4bc5bda0 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 import java.nio.file.Path;
 import java.util.UUID;
 
-import static io.github.benas.randombeans.api.EnhancedRandom.random;
 import static io.qameta.allure.FileSystemResultsWriter.generateTestResultName;
+import static io.qameta.allure.test.ThreadLocalEnhancedRandom.current;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -35,7 +35,7 @@ public class FileSystemResultsWriterTest {
     void shouldNotFailIfNoResultsDirectory(@TempDir final Path folder) {
         Path resolve = folder.resolve("some-directory");
         FileSystemResultsWriter writer = new FileSystemResultsWriter(resolve);
-        final TestResult testResult = random(TestResult.class, "steps");
+        final TestResult testResult = current().nextObject(TestResult.class, "steps");
         writer.write(testResult);
     }
 
@@ -43,7 +43,7 @@ void shouldNotFailIfNoResultsDirectory(@TempDir final Path folder) {
     void shouldWriteTestResult(@TempDir final Path folder) {
         FileSystemResultsWriter writer = new FileSystemResultsWriter(folder);
         final String uuid = UUID.randomUUID().toString();
-        final TestResult testResult = random(TestResult.class, "steps").setUuid(uuid);
+        final TestResult testResult = current().nextObject(TestResult.class, "steps").setUuid(uuid);
         writer.write(testResult);
 
         final String fileName = generateTestResultName(uuid);
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
index 44b77706b..3e70d0a03 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
index 5a325a5f0..0a0ba0f78 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package io.qameta.allure;
 
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.listener.LifecycleNotifier;
 import io.qameta.allure.listener.StepLifecycleListener;
 import io.qameta.allure.model.Attachment;
@@ -23,17 +22,13 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 
-import java.util.UUID;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -133,45 +128,12 @@ public void beforeStepStop(final StepResult result) {
     }
 
     protected AllureResults run(final StepLifecycleListener listener, final String... steps) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final LifecycleNotifier notifier = new LifecycleNotifier(
-                emptyList(),
-                emptyList(),
-                emptyList(),
-                singletonList(listener)
+        return RunUtils.runWithinTestContext(
+                writer -> new AllureLifecycle(
+                        writer,
+                        new LifecycleNotifier(List.of(), List.of(), List.of(), List.of(listener))
+                ),
+                () -> Stream.of(steps).forEach(step -> Allure.step(step, Status.PASSED))
         );
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer, notifier);
-
-        final String uuid = UUID.randomUUID().toString();
-        final TestResult result = new TestResult().setUuid(uuid);
-
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-
-            lifecycle.scheduleTestCase(result);
-            lifecycle.startTestCase(uuid);
-
-            Stream.of(steps).forEach(step -> {
-                final String stepUuid = UUID.randomUUID().toString();
-                lifecycle.startStep(stepUuid, new StepResult().setName(step).setStatus(Status.PASSED));
-                lifecycle.stopStep(stepUuid);
-            });
-        } catch (Throwable e) {
-            lifecycle.updateTestCase(uuid, testResult -> {
-                getStatus(e).ifPresent(testResult::setStatus);
-                getStatusDetails(e).ifPresent(testResult::setStatusDetails);
-
-            });
-        } finally {
-            lifecycle.stopTestCase(uuid);
-            lifecycle.writeTestCase(uuid);
-
-            Allure.setLifecycle(cached);
-            StepsAspects.setLifecycle(cached);
-        }
-
-        return writer;
     }
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
index 72e3d2f5e..dd053822e 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.qameta.allure.aspects;
 
 import io.qameta.allure.Issue;
+import io.qameta.allure.Param;
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
@@ -30,6 +31,7 @@
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static io.qameta.allure.test.TestData.randomString;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
@@ -285,6 +287,35 @@ void shouldSupportParallelStepsRun() {
                 );
     }
 
+    @Test
+    void shouldProcessParamAnnotation() {
+        final String p1 = randomString(10);
+        final String p2 = randomString(10);
+        final String p3 = randomString(10);
+        final String p4 = randomString(10);
+        final AllureResults results = runWithinTestContext(() -> stepWithParamAnnotation(p1, p2, p3, p4));
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .flatExtracting(StepResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getExcluded, Parameter::getMode)
+                .containsExactlyInAnyOrder(
+                        tuple("Named", p1, false, Parameter.Mode.DEFAULT),
+                        tuple("Excluded", p2, true, Parameter.Mode.DEFAULT),
+                        tuple("Masked", p3, false, Parameter.Mode.MASKED),
+                        tuple("Masked", p4, false, Parameter.Mode.HIDDEN)
+                );
+
+    }
+
+    @Step
+    void stepWithParamAnnotation(
+            @Param("Named") final String named,
+            @Param(name = "Excluded", excluded = true) final String excluded,
+            @Param(name = "Masked", mode = Parameter.Mode.MASKED) final String masked,
+            @Param(name = "Masked", mode = Parameter.Mode.HIDDEN) final String hidden) {
+    }
+
     @Step
     void stepWithDefaultName() {
     }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java b/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
index 722e1027f..77fefe583 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
index ff3473519..7cdf5ebe2 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
index 8231cb698..31f42ec82 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
index 60c58714b..d9476fda9 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index 5c346ddd2..71d3b47d8 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -416,4 +416,39 @@ void complexCase() {
                         tuple("owner", "tester2")
                 );
     }
+
+    @Issue("i-1")
+    @Link("example")
+    @Feature("a")
+    static class InheritedParentTest1 {
+    }
+
+    @Issue("i-2")
+    @Story("b")
+    static class InheritedChildTest1 extends InheritedParentTest1 {
+    }
+
+    @Test
+    void inheritedLabelAnnotationsTest() {
+        final Set<Label> labels1 = getLabels(InheritedChildTest1.class);
+
+        assertThat(labels1)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("feature", "a"),
+                        tuple("story", "b")
+                );
+    }
+
+    @Test
+    void inheritedLinkAnnotationsTest() {
+        final Set<io.qameta.allure.model.Link> links = getLinks(InheritedChildTest1.class);
+
+        assertThat(links)
+                .extracting(io.qameta.allure.model.Link::getName, io.qameta.allure.model.Link::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("i-2", "issue"),
+                        tuple("example", "custom")
+                );
+    }
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
index c1fb825fa..422c825cd 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AspectUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
similarity index 94%
rename from allure-java-commons/src/test/java/io/qameta/allure/util/AspectUtilsTest.java
rename to allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
index ea5af2cde..218ef4a33 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AspectUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-class AspectUtilsTest {
+class ObjectUtilsTest {
 
     @Issue("191")
     @Test
diff --git a/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml b/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml
+++ b/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
     </aspects>
-</aspectj>
\ No newline at end of file
+</aspectj>
diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
deleted file mode 100644
index fa8b72725..000000000
--- a/allure-java-migration/build.gradle.kts
+++ /dev/null
@@ -1,41 +0,0 @@
-description = "Allure Java Migration Utils"
-
-val agent: Configuration by configurations.creating
-
-val junitVersion = "4.12"
-val testNgVersion = "6.14.3"
-
-dependencies {
-    agent("org.aspectj:aspectjweaver")
-    api("org.apache.commons:commons-lang3")
-    api("org.aspectj:aspectjrt")
-    api(project(":allure-java-commons"))
-    implementation("junit:junit:$junitVersion")
-    implementation("org.testng:testng:$testNgVersion")
-    testImplementation("io.github.glytching:junit-extensions")
-    testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-params")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.slf4j:slf4j-simple")
-    testImplementation("org.testng:testng:$testNgVersion")
-    testImplementation(project(":allure-java-commons-test"))
-    testImplementation(project(":allure-junit-platform"))
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-}
-
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.migration"
-        ))
-    }
-}
-
-tasks.test {
-    useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
deleted file mode 100644
index 3bbfc613c..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.TestResult;
-import org.aspectj.lang.reflect.MethodSignature;
-import ru.yandex.qatools.allure.annotations.Description;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Issue;
-import ru.yandex.qatools.allure.annotations.Issues;
-import ru.yandex.qatools.allure.annotations.Severity;
-import ru.yandex.qatools.allure.annotations.Stories;
-import ru.yandex.qatools.allure.annotations.TestCaseId;
-import ru.yandex.qatools.allure.annotations.Title;
-import ru.yandex.qatools.allure.model.DescriptionType;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-
-/**
- * Allure labels utils.
- */
-final class Allure1Annotations {
-
-    private static final String SUITE_LABEL = "suite";
-
-    private final MethodSignature signature;
-
-    private final Object[] args;
-
-    Allure1Annotations(final MethodSignature signature, final Object... args) {
-        this.args = Arrays.copyOf(args, args.length);
-        this.signature = signature;
-    }
-
-    public void updateTitle(final TestResult result) {
-        final Method method = getMethod();
-        if (method.isAnnotationPresent(Title.class)) {
-            final Title title = method.getAnnotation(Title.class);
-            result.setName(title.value());
-        }
-        final Class<?> type = getType();
-        if (type.isAnnotationPresent(Title.class)) {
-            final Title title = type.getAnnotation(Title.class);
-            final List<Label> labels = result.getLabels().stream()
-                    .filter(label -> !label.getName().equals(SUITE_LABEL))
-                    .collect(Collectors.toList());
-            labels.add(new Label().setName(SUITE_LABEL).setValue(title.value()));
-            result.setLabels(labels);
-        }
-    }
-
-    public void updateDescription(final TestResult result) {
-        final Method method = getMethod();
-        if (method.isAnnotationPresent(Description.class)) {
-            final Description description = method.getAnnotation(Description.class);
-            if (description.type().equals(DescriptionType.HTML)) {
-                result.setDescriptionHtml(description.value());
-            } else {
-                result.setDescription(description.value());
-            }
-        }
-    }
-
-    public void updateLabels(final TestResult result) {
-        result.getLabels().addAll(getLabels());
-    }
-
-    public void updateLinks(final TestResult result) {
-        result.getLinks().addAll(getLinks());
-    }
-
-    public void updateParameters(final TestResult result) {
-        result.getParameters().addAll(getMethodParameters());
-    }
-
-    private List<Parameter> getMethodParameters() {
-        final String[] parameterNames = signature.getParameterNames();
-        return IntStream.range(0, parameterNames.length)
-                .mapToObj(index -> createParameter(parameterNames[index], args[index]))
-                .collect(Collectors.toList());
-    }
-
-    private Class<?> getType() {
-        return signature.getMethod().getDeclaringClass();
-    }
-
-    private Method getMethod() {
-        return signature.getMethod();
-    }
-
-    private List<Label> getLabels() {
-        final Method method = getMethod();
-        final List<Label> labels = new ArrayList<>();
-        labels.addAll(Allure1Utils.getLabels(method, Severity.class, Allure1Utils::createLabels));
-        labels.addAll(Allure1Utils.getLabels(method, Stories.class, Allure1Utils::createLabels));
-        labels.addAll(Allure1Utils.getLabels(method, Features.class, Allure1Utils::createLabels));
-        return labels;
-    }
-
-    public List<Link> getLinks() {
-        final Method method = getMethod();
-        final List<Link> links = new ArrayList<>();
-        links.addAll(Allure1Utils.getLinks(method, TestCaseId.class, Allure1Utils::createLinks));
-        links.addAll(Allure1Utils.getLinks(method, Issue.class, Allure1Utils::createLinks));
-        links.addAll(Allure1Utils.getLinks(method, Issues.class, Allure1Utils::createLinks));
-        return links;
-    }
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
deleted file mode 100644
index d3c8e21b6..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import ru.yandex.qatools.allure.annotations.Attachment;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Objects;
-
-/**
- * Aspects (AspectJ) for handling {@link Attachment}.
- */
-@Aspect
-public class Allure1AttachAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    /**
-     * Pointcut for things annotated with {@link ru.yandex.qatools.allure.annotations.Attachment}.
-     */
-    @Pointcut("@annotation(ru.yandex.qatools.allure.annotations.Attachment)")
-    public void withAttachmentAnnotation() {
-        //pointcut body, should be empty
-    }
-
-    /**
-     * Pointcut for any methods.
-     */
-    @Pointcut("execution(* *(..))")
-    public void anyMethod() {
-        //pointcut body, should be empty
-    }
-
-    /**
-     * Process data returned from method annotated with {@link ru.yandex.qatools.allure.annotations.Attachment}
-     * If returned data is not a byte array, then use toString() method, and get bytes from it using.
-     */
-    @AfterReturning(pointcut = "anyMethod() && withAttachmentAnnotation()", returning = "result")
-    public void attachment(final JoinPoint joinPoint, final Object result) {
-        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-        final Attachment attachment = methodSignature.getMethod().getAnnotation(Attachment.class);
-
-        final String title = Allure1Utils.getTitle(
-                attachment.value(),
-                methodSignature.getName(),
-                joinPoint.getThis(),
-                joinPoint.getArgs()
-        );
-
-        final byte[] bytes = (result instanceof byte[])
-                ? (byte[]) result : Objects.toString(result).getBytes(StandardCharsets.UTF_8);
-        getLifecycle().addAttachment(title, attachment.type(), "", bytes);
-    }
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle lifecycle) {
-        Allure1AttachAspects.lifecycle = lifecycle;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-
-
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
deleted file mode 100644
index 7eacbabdb..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.FieldSignature;
-import ru.yandex.qatools.allure.annotations.Parameter;
-
-import java.util.Objects;
-
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-
-/**
- * Aspects for Allure1 Parameters.
- */
-@SuppressWarnings("all")
-@Aspect
-public class Allure1ParametersAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    @Pointcut("@annotation(ru.yandex.qatools.allure.annotations.Parameter)")
-    public void withParameterAnnotation() {
-        //pointcut body, should be empty
-    }
-
-    @Pointcut("set(* *)")
-    public void setValueToAnyField() {
-        //pointcut body, should be empty
-    }
-
-    @After("setValueToAnyField() && withParameterAnnotation()")
-    public void parameterValueChanged(JoinPoint joinPoint) {
-        try {
-            FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
-            Parameter parameter = fieldSignature.getField().getAnnotation(Parameter.class);
-            String name = parameter.value().isEmpty() ? fieldSignature.getName() : parameter.value();
-            String value = Objects.toString(joinPoint.getArgs()[0]);
-
-            getLifecycle().updateTestCase(testResult ->
-                    testResult.getParameters().add(createParameter(name, value))
-            );
-        } catch (Exception ignored) {
-        }
-    }
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle allure) {
-        lifecycle = allure;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
deleted file mode 100644
index c3d93787d..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StepResult;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import ru.yandex.qatools.allure.annotations.Step;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.aspects.Allure1Utils.getName;
-import static io.qameta.allure.aspects.Allure1Utils.getTitle;
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-
-/**
- * Aspects (AspectJ) for handling {@link Step}.
- */
-@Aspect
-@SuppressWarnings("unused")
-public class Allure1StepsAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    @Pointcut("@annotation(ru.yandex.qatools.allure.annotations.Step)")
-    public void withStepAnnotation() {
-        //pointcut body, should be empty
-    }
-
-    @Pointcut("execution(* *(..))")
-    public void anyMethod() {
-        //pointcut body, should be empty
-    }
-
-    @Before("anyMethod() && withStepAnnotation()")
-    public void stepStart(final JoinPoint joinPoint) {
-        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-        final String uuid = UUID.randomUUID().toString();
-        final StepResult result = new StepResult()
-                .setName(createTitle(joinPoint))
-                .setParameters(getParameters(methodSignature, joinPoint.getArgs()));
-
-        getLifecycle().startStep(uuid, result);
-    }
-
-    @AfterThrowing(pointcut = "anyMethod() && withStepAnnotation()", throwing = "e")
-    public void stepFailed(final JoinPoint joinPoint, final Throwable e) {
-        getLifecycle().updateStep(result -> result
-                .setStatus(getStatus(e).orElse(Status.BROKEN))
-                .setStatusDetails(getStatusDetails(e).orElse(null)));
-        getLifecycle().stopStep();
-    }
-
-    @AfterReturning(pointcut = "anyMethod() && withStepAnnotation()", returning = "result")
-    public void stepStop(final JoinPoint joinPoint, final Object result) {
-        getLifecycle().updateStep(step -> step.setStatus(Status.PASSED));
-        getLifecycle().stopStep();
-    }
-
-    public String createTitle(final JoinPoint joinPoint) {
-        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-        final Step step = methodSignature.getMethod().getAnnotation(Step.class);
-        return step.value().isEmpty()
-                ? getName(methodSignature.getName(), joinPoint.getArgs())
-                : getTitle(step.value(), methodSignature.getName(), joinPoint.getThis(), joinPoint.getArgs());
-    }
-
-    private static List<Parameter> getParameters(final MethodSignature signature, final Object... args) {
-        return IntStream.range(0, args.length)
-                .mapToObj(index -> createParameter(signature.getParameterNames()[index], args[index]))
-                .collect(Collectors.toList());
-    }
-
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle allure) {
-        lifecycle = allure;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
deleted file mode 100644
index 8e0a1ed91..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.reflect.MethodSignature;
-
-import java.util.Objects;
-
-/**
- * Allure junit aspects.
- */
-@Aspect
-public class Allure1TestCaseAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    @Before("execution(@org.junit.Test * *.*(..))")
-    public void junitTestStart(final JoinPoint joinPoint) {
-        updateTestCase(joinPoint);
-    }
-
-    @Before("execution(@org.testng.annotations.Test * *.*(..))")
-    public void testNgTestStart(final JoinPoint joinPoint) {
-        updateTestCase(joinPoint);
-    }
-
-    private void updateTestCase(final JoinPoint joinPoint) {
-        final MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        final Object[] args = joinPoint.getArgs();
-        final Allure1Annotations annotations = new Allure1Annotations(signature, args);
-        getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
-            getLifecycle().updateTestCase(uuid, annotations::updateTitle);
-            getLifecycle().updateTestCase(uuid, annotations::updateDescription);
-            getLifecycle().updateTestCase(uuid, annotations::updateParameters);
-            getLifecycle().updateTestCase(uuid, annotations::updateLabels);
-            getLifecycle().updateTestCase(uuid, annotations::updateLinks);
-        });
-    }
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle lifecycle) {
-        Allure1TestCaseAspects.lifecycle = lifecycle;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
deleted file mode 100644
index 48acffa35..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.util.ResultsUtils;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Issue;
-import ru.yandex.qatools.allure.annotations.Issues;
-import ru.yandex.qatools.allure.annotations.Severity;
-import ru.yandex.qatools.allure.annotations.Stories;
-import ru.yandex.qatools.allure.annotations.TestCaseId;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * Some utils that help process steps and attachments names and titles.
- */
-final class Allure1Utils {
-
-    private static final String SEVERITY_LABEL = "severity";
-
-    private static final String FEATURE_LABEL = "feature";
-
-    private static final String STORY_LABEL = "story";
-
-    /**
-     * Don't instance this class.
-     */
-    private Allure1Utils() {
-    }
-
-    /**
-     * Generate method in the following format: {methodName}[{param1}, {param2}, ...].
-     */
-    public static String getName(final String methodName, final Object... parameters) {
-        return methodName + getParametersAsString(parameters);
-    }
-
-    /**
-     * Convert array of given parameters to sting.
-     */
-    public static String getParametersAsString(final Object... parameters) {
-        if (parameters == null || parameters.length == 0) {
-            return "";
-        }
-        final StringBuilder builder = new StringBuilder();
-        builder.append('[');
-        for (int i = 0; i < parameters.length; i++) {
-            builder.append(arrayToString(parameters[i]));
-            if (i < parameters.length - 1) {
-                builder.append(", ");
-            }
-        }
-        return builder.append(']').toString();
-    }
-
-    /**
-     * Generate title using name pattern. First step all "{method}" substrings will be replaced
-     * with given method name. Then replace all "{i}" substrings with i-th parameter.
-     */
-    public static String getTitle(final String namePattern, final String methodName,
-                                  final Object instance, final Object... parameters) {
-        final String finalPattern = namePattern
-                .replaceAll("\\{method}", methodName)
-                .replaceAll("\\{this}", String.valueOf(instance));
-        final int paramsCount = parameters == null ? 0 : parameters.length;
-        final Object[] results = new Object[paramsCount];
-        for (int i = 0; i < paramsCount; i++) {
-            results[i] = arrayToString(parameters[i]);
-        }
-
-        return MessageFormat.format(finalPattern, results);
-    }
-
-    /**
-     * {@link Arrays#toString(Object[])} with {@link Arrays#toString(Object[])} for array elements.
-     */
-    public static Object arrayToString(final Object obj) {
-        if (obj != null && obj.getClass().isArray()) {
-            final int len = Array.getLength(obj);
-            final String[] strings = new String[len];
-            for (int i = 0; i < len; i++) {
-                strings[i] = String.valueOf(Array.get(obj, i));
-            }
-            return Arrays.toString(strings);
-        } else {
-            return obj;
-        }
-    }
-
-    public static <T extends Annotation> List<Label> getLabels(final Method method, final Class<T> annotation,
-                                                               final Function<T, List<Label>> extractor) {
-        final List<Label> labels = new ArrayList<>();
-        labels.addAll(getLabels((AnnotatedElement) method, annotation, extractor));
-        labels.addAll(getLabels(method.getDeclaringClass(), annotation, extractor));
-        return labels;
-    }
-
-    private static <T extends Annotation> List<Label> getLabels(final AnnotatedElement element,
-                                                                final Class<T> annotation,
-                                                                final Function<T, List<Label>> extractor) {
-        return element.isAnnotationPresent(annotation)
-                ? extractor.apply(element.getAnnotation(annotation))
-                : Collections.emptyList();
-    }
-
-    public static <T extends Annotation> List<Link> getLinks(final Method method, final Class<T> annotation,
-                                                             final Function<T, List<Link>> extractor) {
-        final List<Link> labels = new ArrayList<>();
-        labels.addAll(getLinks((AnnotatedElement) method, annotation, extractor));
-        labels.addAll(getLinks(method.getDeclaringClass(), annotation, extractor));
-        return labels;
-    }
-
-    private static <T extends Annotation> List<Link> getLinks(final AnnotatedElement element,
-                                                              final Class<T> annotation,
-                                                              final Function<T, List<Link>> extractor) {
-        return element.isAnnotationPresent(annotation)
-                ? extractor.apply(element.getAnnotation(annotation))
-                : Collections.emptyList();
-    }
-
-    public static List<Label> createLabels(final Stories stories) {
-        return Arrays.stream(stories.value())
-                .map(value -> new Label().setName(STORY_LABEL).setValue(value))
-                .collect(Collectors.toList());
-    }
-
-    public static List<Label> createLabels(final Features features) {
-        return Arrays.stream(features.value())
-                .map(value -> new Label().setName(FEATURE_LABEL).setValue(value))
-                .collect(Collectors.toList());
-    }
-
-    public static List<Label> createLabels(final Severity severity) {
-        return Collections.singletonList(new Label().setName(SEVERITY_LABEL).setValue(severity.value().value()));
-    }
-
-    public static List<Link> createLinks(final Issues issues) {
-        return Arrays.stream(issues.value())
-                .map(Allure1Utils::createLink)
-                .collect(Collectors.toList());
-    }
-
-    public static List<Link> createLinks(final Issue issue) {
-        return Collections.singletonList(createLink(issue));
-    }
-
-    public static List<Link> createLinks(final TestCaseId issue) {
-        return Collections.singletonList(ResultsUtils.createTmsLink(issue.value()));
-    }
-
-    private static Link createLink(final Issue issue) {
-        return ResultsUtils.createIssueLink(issue.value());
-    }
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
deleted file mode 100644
index 8b919da51..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *  A file with additional information captured during a test such
- *  as log, screenshot, log file, dump, server response and so on.
- *  When some test fails attachments help to understand the reason
- *  of failure faster.
- *  <p/>
- *  An attachment is simply a method annotated with
- *  {@link ru.yandex.qatools.allure.annotations.Attachment} returns
- *  either String or byte array which should be added to report:
- *  <p/>
- *  <pre>
- *  &#064;Attachment(value = "Page screenshot", type = "image/png")
- *  public byte[] saveScreenshot(byte[] screenShot) {
- *      return screenShot;
- *  }
- *  </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Attachment {
-
-    /**
-     *  Attachment name.
-     */
-    String value() default "{method}";
-
-    /**
-     * Valid attachment MimeType, for example "text/plain" or "application/json".
-     */
-    String type() default "";
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
deleted file mode 100644
index 694d1ad63..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import ru.yandex.qatools.allure.model.DescriptionType;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Using this annotation you can add some text description
- * to test suite or test case.
- * <pre>
- * &#064;Test
- * &#064;Description("This is an example of my test")
- * public void myTest() throws Exception {
- *      ...
- * }
- * </pre>
- * @see ru.yandex.qatools.allure.model.DescriptionType
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Description {
-
-    String value();
-
-    DescriptionType type() default DescriptionType.TEXT;
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
deleted file mode 100644
index 32ed82576..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * In order to group your tests by features simply annotate test suite
- * or test case with {@link ru.yandex.qatools.allure.annotations.Features}
- * annotation. This annotation can take either one string or a string
- * array because one test case can relate to several features:
- * <p/>
- * <pre>
- * &#064;Features({"Feature1", "Feature2"})
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- *
- * &#064;Features("Feature")
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Features {
-
-    String[] value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
deleted file mode 100644
index 6dc700f9d..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to link multiple issues from issue tracker to test cases and test suites. Usage:
- * <p/>
- * <pre>
- * &#064;Issues({
- *     &#064;Issue("MYPROJECT-1"),
- *     &#064;Issue("MYPROJECT-2")
- * })
- * public void myTest(){
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Issues {
-
-    Issue[] value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
deleted file mode 100644
index 970a73448..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * You can use this annotation to add parameters to your tests:
- * <pre>
- * &#064;Parameter("My Param")
- * private String myParameter;
- *
- * &#064;Test
- * public void myTest() throws Exception {
- *      myParameter = "first";
- *      myParameter = "second";
- *      myParameter = "third";
- * }
- * </pre>
- * All three values will be added to report
- *
- * Note that the initializations of constant fields (static final fields
- * where the initializer is a constant string object or primitive value)
- * are not join points, since Java requires their references to be inlined.
- *
- * value - it's name of parameter, field name by default
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.PARAMETER})
-public @interface Parameter {
-
-    String value() default "";
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
deleted file mode 100644
index 92f3266fb..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * In order to define steps you need to annotate respective methods
- * with @Step annotation. When not specified step name equals to
- * annotated method name converted to human readable format. To
- * define explicit step name:
- * <pre>
- * &#064;Step("Open '{0}' page.")
- * public void openPageByAddress(String pageAddress) {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Step {
-
-    String value() default "";
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
deleted file mode 100644
index 09e4470fb..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * In order to group your tests by stories simply annotate test suite
- * or test case with {@link ru.yandex.qatools.allure.annotations.Stories}
- * annotation. This annotation can take either one string or a string
- * array because one test case can relate to several stories:
- * <pre>
- * &#064;Stories({"Story1", "Story2"})
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- *
- * &#064;Stories("Story")
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Stories {
-
-    String[] value();
-
-}
diff --git a/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml b/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml
deleted file mode 100644
index 6c013660f..000000000
--- a/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<aspectj>
-    <aspects>
-        <aspect name="io.qameta.allure.aspects.Allure1TestCaseAspects"/>
-        <aspect name="io.qameta.allure.aspects.Allure1StepsAspects"/>
-        <aspect name="io.qameta.allure.aspects.Allure1AttachAspects"/>
-        <aspect name="io.qameta.allure.aspects.Allure1ParametersAspects"/>
-    </aspects>
-    <weaver options="-warn:none -Xlint:ignore"/>
-</aspectj>
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
deleted file mode 100644
index 47df223cf..000000000
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureResults;
-import org.junit.jupiter.api.Test;
-import ru.yandex.qatools.allure.annotations.Attachment;
-
-import static io.qameta.allure.test.RunUtils.runWithinTestContext;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-/**
- * eroshenkoam
- * 30.04.17
- */
-class Allure1AttachAspectsTest {
-
-    @Test
-    void shouldSetupAttachmentTitleFromAnnotation() {
-        final AllureResults results = runWithinTestContext(
-                () -> attachmentWithTitleAndType("parameter value"),
-                Allure1AttachAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .extracting("name", "type")
-                .containsExactly(tuple("attachment with parameter value", "text/plain"));
-
-    }
-
-    @Test
-    void shouldSetupAttachmentTitleFromMethodSignature() {
-        final AllureResults results = runWithinTestContext(
-                this::attachmentWithoutTitle,
-                Allure1AttachAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .extracting("name", "type")
-                .containsExactly(tuple("attachmentWithoutTitle", null));
-
-    }
-
-    @Test
-    void shouldProcessNullAttachment() {
-        final AllureResults results = runWithinTestContext(
-                this::attachmentWithNullValue,
-                Allure1AttachAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .extracting("name", "type")
-                .containsExactly(tuple("attachmentWithNullValue", null));
-    }
-
-    @SuppressWarnings("all")
-    @Attachment
-    byte[] attachmentWithNullValue() {
-        return null;
-    }
-
-    @SuppressWarnings("all")
-    @Attachment
-    byte[] attachmentWithoutTitle() {
-        return new byte[]{};
-    }
-
-    @SuppressWarnings({"all"})
-    @Attachment(value = "attachment with {0}", type = "text/plain")
-    byte[] attachmentWithTitleAndType(String parameter) {
-        return new byte[]{};
-    }
-
-}
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
deleted file mode 100644
index 6458b5f47..000000000
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureResults;
-import org.junit.jupiter.api.Test;
-import ru.yandex.qatools.allure.annotations.Step;
-
-import static io.qameta.allure.test.RunUtils.runWithinTestContext;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-public class Allure1StepsAspectsTest {
-
-    @Test
-    void shouldSetupStepTitleFromAnnotation() {
-        final AllureResults results = runWithinTestContext(
-                () -> stepWithTitleAndWithParameter("parameter value"),
-                Allure1StepsAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly("step with title and parameter [parameter value]");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .flatExtracting(StepResult::getParameters)
-                .extracting("name", "value")
-                .containsExactly(tuple("parameter", "parameter value"));
-    }
-
-    @Test
-    void shouldSetupStepTitleFromMethodSignature() {
-        final AllureResults results = runWithinTestContext(
-                () -> stepWithoutTitleAndWithParameter("parameter value"),
-                Allure1StepsAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly("stepWithoutTitleAndWithParameter[parameter value]");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .flatExtracting(StepResult::getParameters)
-                .extracting("name", "value")
-                .containsExactly(tuple("parameter", "parameter value"));
-    }
-
-    @SuppressWarnings("all")
-    @Step
-    void stepWithoutTitleAndWithParameter(String parameter) {
-
-    }
-
-    @SuppressWarnings("all")
-    @Step("step with title and parameter [{0}]")
-    void stepWithTitleAndWithParameter(String parameter) {
-    }
-
-}
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
deleted file mode 100644
index 9f92462a7..000000000
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureResults;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import ru.yandex.qatools.allure.annotations.Description;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Issue;
-import ru.yandex.qatools.allure.annotations.Issues;
-import ru.yandex.qatools.allure.annotations.Parameter;
-import ru.yandex.qatools.allure.annotations.Severity;
-import ru.yandex.qatools.allure.annotations.Stories;
-import ru.yandex.qatools.allure.annotations.TestCaseId;
-import ru.yandex.qatools.allure.annotations.Title;
-import ru.yandex.qatools.allure.model.SeverityLevel;
-
-import java.util.stream.Stream;
-
-import static io.qameta.allure.test.RunUtils.runWithinTestContext;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-/**
- * eroshenkoam
- * 30.04.17
- */
-class Allure1TestCaseAspectsTest {
-
-    static Stream<SimpleTest> testClassesProvider() {
-        return Stream.of(new JunitTest(), new TestNgTest());
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessFeaturesAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("feature"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder("feature1", "feature2");
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessStoriesAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("story"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder("story1", "story2");
-
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessSeverityAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("severity"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder(SeverityLevel.CRITICAL.value());
-
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessIssuesAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLinks)
-                .extracting(Link::getName)
-                .containsExactlyInAnyOrder("ISSUE-1", "ISSUE-11", "ISSUE-2", "ISSUE-22", "TEST-1");
-
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessTitleAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getName)
-                .containsExactlyInAnyOrder("testcase");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("suite"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder("testsuite");
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessDescriptionAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getDescription)
-                .containsExactlyInAnyOrder("testcase description");
-
-    }
-
-    @SuppressWarnings("unchecked")
-    @Issue("206")
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessParameterAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getParameters)
-                .extracting(io.qameta.allure.model.Parameter::getName, io.qameta.allure.model.Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("parameterWithoutName", "testValue1"),
-                        tuple("customParameterName", "testValue2")
-                );
-    }
-
-    public interface SimpleTest {
-
-        void testSomething();
-
-    }
-
-    @Title("testsuite")
-    @Issue("ISSUE-1")
-    @Issues(@Issue("ISSUE-11"))
-    @Stories("story1")
-    @Features("feature1")
-    public static class TestNgTest implements SimpleTest {
-
-        @Parameter
-        public String parameterWithoutName;
-        @Parameter("customParameterName")
-        private String parameterWithName;
-        @Parameter
-        private String uninitializedParameter;
-
-        @Title("testcase")
-        @Description("testcase description")
-        @Issue("ISSUE-2")
-        @Issues(@Issue("ISSUE-22"))
-        @TestCaseId("TEST-1")
-        @Stories("story2")
-        @Features("feature2")
-        @Severity(SeverityLevel.CRITICAL)
-        @org.testng.annotations.Test
-        public void testSomething() {
-            parameterWithoutName = "testValue1";
-            parameterWithName = "testValue2";
-        }
-
-    }
-
-    @Title("testsuite")
-    @Issue("ISSUE-1")
-    @Issues(@Issue("ISSUE-11"))
-    @Stories("story1")
-    @Features("feature1")
-    public static class JunitTest implements SimpleTest {
-
-        @Parameter
-        private String parameterWithoutName;
-        @Parameter("customParameterName")
-        private String parameterWithName;
-        @Parameter
-        private String uninitializedParameter;
-
-        @Title("testcase")
-        @Description("testcase description")
-        @Issue("ISSUE-2")
-        @Issues(@Issue("ISSUE-22"))
-        @TestCaseId("TEST-1")
-        @Stories("story2")
-        @Features("feature2")
-        @Severity(SeverityLevel.CRITICAL)
-        @org.junit.Test
-        public void testSomething() {
-            parameterWithoutName = "testValue1";
-            parameterWithName = "testValue2";
-        }
-
-    }
-}
diff --git a/allure-jax-rs/build.gradle.kts b/allure-jax-rs/build.gradle.kts
index 441bb7573..acf1b19c9 100644
--- a/allure-jax-rs/build.gradle.kts
+++ b/allure-jax-rs/build.gradle.kts
@@ -1,13 +1,11 @@
 description = "Allure JAX-RS Filter Integration"
 
-val agent: Configuration by configurations.creating
-
 val javaxWsRsApiVersion = "2.1.1"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
-    implementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
+    compileOnly("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
+    testImplementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
     testImplementation("com.github.tomakehurst:wiremock")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
@@ -29,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
index 7d28b0a1f..d7f61baa0 100644
--- a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
+++ b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
index 3f3ea9e27..d0bc75158 100644
--- a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
+++ b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
index a584086e4..3be58500b 100644
--- a/allure-jbehave/build.gradle.kts
+++ b/allure-jbehave/build.gradle.kts
@@ -1,14 +1,12 @@
 description = "Allure JBehave Integration"
 
-val agent: Configuration by configurations.creating
-
-val jbehaveVersion = "4.5"
+val jbehaveVersion = "4.8.3"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("org.jbehave:jbehave-core:$jbehaveVersion")
+    compileOnly("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
@@ -27,7 +25,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
index b362e3e71..d1ee185b7 100644
--- a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
+++ b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
index a2f7fe9c2..1f1917b97 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package io.qameta.allure.jbehave;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
 import io.qameta.allure.jbehave.samples.BrokenStorySteps;
 import io.qameta.allure.jbehave.samples.SimpleStorySteps;
@@ -27,7 +25,7 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.jbehave.core.configuration.MostUsefulConfiguration;
 import org.jbehave.core.embedder.Embedder;
 import org.jbehave.core.embedder.EmbedderControls;
@@ -176,7 +174,7 @@ void shouldSetDescription() {
         final AllureResults results = runStories("stories/description.story");
 
         final String expected = "This is description for current story.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
         assertThat(results.getTestResults())
                 .extracting(TestResult::getDescription)
@@ -267,42 +265,34 @@ void shouldNotFailIfGivenStoriesSpecified() {
     }
 
     private AllureResults runStories(final String... storyResources) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-
-        final Embedder embedder = new Embedder();
-        embedder.useEmbedderMonitor(new NullEmbedderMonitor());
-        embedder.useEmbedderControls(new EmbedderControls()
-                .doGenerateViewAfterStories(false)
-                .doFailOnStoryTimeout(false)
-                .doBatch(false)
-                .doIgnoreFailureInStories(true)
-                .doIgnoreFailureInView(true)
-                .doVerboseFailures(false)
-                .doVerboseFiltering(false)
-        );
-        final AllureJbehave allureJbehave = new AllureJbehave(lifecycle);
-        embedder.useConfiguration(new MostUsefulConfiguration()
-                .useStoryLoader(new LoadFromClasspath(this.getClass()))
-                .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
-                        .withReporters(allureJbehave)
-                )
-                .useDefaultStoryReporter(new NullStoryReporter())
-        );
-        final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
-                embedder.configuration(),
-                new SimpleStorySteps(),
-                new BrokenStorySteps()
-        );
-        embedder.useCandidateSteps(stepsFactory.createCandidateSteps());
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final Embedder embedder = new Embedder();
+            embedder.useEmbedderMonitor(new NullEmbedderMonitor());
+            embedder.useEmbedderControls(new EmbedderControls()
+                    .doGenerateViewAfterStories(false)
+                    .doFailOnStoryTimeout(false)
+                    .doBatch(false)
+                    .doIgnoreFailureInStories(true)
+                    .doIgnoreFailureInView(true)
+                    .doVerboseFailures(false)
+                    .doVerboseFiltering(false)
+            );
+            final AllureJbehave allureJbehave = new AllureJbehave(lifecycle);
+            embedder.useConfiguration(new MostUsefulConfiguration()
+                    .useStoryLoader(new LoadFromClasspath(this.getClass()))
+                    .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
+                            .withReporters(allureJbehave)
+                    )
+                    .useDefaultStoryReporter(new NullStoryReporter())
+            );
+            final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
+                    embedder.configuration(),
+                    new SimpleStorySteps(),
+                    new BrokenStorySteps()
+            );
+            embedder.useCandidateSteps(stepsFactory.createCandidateSteps());
             embedder.runStoriesAsPaths(Arrays.asList(storyResources));
-        } finally {
-            Allure.setLifecycle(cached);
-        }
-        return writer;
+        });
     }
 
     static class ReportlessStoryReporterBuilder extends StoryReporterBuilder {
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
index 19103dfb4..dc3b7ba83 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
index edc2a804e..e401c825f 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
index 9e7a664b0..45a93ede9 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/build.gradle.kts b/allure-jbehave5/build.gradle.kts
new file mode 100644
index 000000000..bdd27f73d
--- /dev/null
+++ b/allure-jbehave5/build.gradle.kts
@@ -0,0 +1,28 @@
+description = "Allure JBehave 5 Integration"
+
+val jbehaveVersion = "5.1.1"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    compileOnly("org.jbehave:jbehave-core:$jbehaveVersion")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.jbehave:jbehave-core:$jbehaveVersion")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.jbehave5"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
new file mode 100644
index 000000000..5ef296db8
--- /dev/null
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -0,0 +1,301 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.ResultsUtils;
+import org.jbehave.core.failures.UUIDExceptionWrapper;
+import org.jbehave.core.model.ExamplesTable;
+import org.jbehave.core.model.Scenario;
+import org.jbehave.core.model.Step;
+import org.jbehave.core.model.Story;
+import org.jbehave.core.reporters.NullStoryReporter;
+import org.jbehave.core.steps.StepCreator;
+import org.jbehave.core.steps.Timing;
+
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+
+import static io.qameta.allure.util.ResultsUtils.bytesToHex;
+import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
+import static io.qameta.allure.util.ResultsUtils.createHostLabel;
+import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
+import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.Comparator.comparing;
+
+public class AllureJbehave5 extends NullStoryReporter {
+
+    private final AllureLifecycle lifecycle;
+
+    private final ThreadLocal<Story> currentStory = new InheritableThreadLocal<>();
+
+    private final ThreadLocal<Scenario> currentScenario = new InheritableThreadLocal<>();
+
+    private final Map<Scenario, List<String>> scenarioUuids = new ConcurrentHashMap<>();
+
+    private final ThreadLocal<Deque<Story>> givenStories = ThreadLocal.withInitial(LinkedList::new);
+
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
+    @SuppressWarnings("unused")
+    public AllureJbehave5() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureJbehave5(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void beforeStory(final Story story, final boolean givenStory) {
+        if (givenStory) {
+            givenStories.get().push(story);
+        } else {
+            currentStory.set(story);
+        }
+    }
+
+    @Override
+    public void afterStory(final boolean givenStory) {
+        if (givenStory) {
+            givenStories.get().pop();
+        } else {
+            currentStory.remove();
+        }
+    }
+
+    @Override
+    public void beforeScenario(final Scenario scenario) {
+        if (isGivenStory()) {
+            return;
+        }
+        currentScenario.set(scenario);
+
+        if (notParameterised(scenario)) {
+            final String uuid = UUID.randomUUID().toString();
+            usingWriteLock(() -> scenarioUuids.put(scenario, new ArrayList<>(singletonList(uuid))));
+            startTestCase(uuid, scenario, emptyMap());
+        } else {
+            usingWriteLock(() -> scenarioUuids.put(scenario, new ArrayList<>()));
+        }
+    }
+
+    @Override
+    public void beforeExamples(final List<String> steps, final ExamplesTable table) {
+        if (isGivenStory()) {
+            return;
+        }
+        final Scenario scenario = currentScenario.get();
+        lock.writeLock().lock();
+        try {
+            scenarioUuids.put(scenario, new ArrayList<>());
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    @Override
+    public void example(final Map<String, String> tableRow, final int exampleIndex) {
+        if (isGivenStory()) {
+            return;
+        }
+        final Scenario scenario = currentScenario.get();
+        final String uuid = UUID.randomUUID().toString();
+        usingWriteLock(() -> scenarioUuids.getOrDefault(scenario, new ArrayList<>()).add(uuid));
+        startTestCase(uuid, scenario, tableRow);
+    }
+
+    @Override
+    public void afterScenario(final Timing timing) {
+        if (isGivenStory()) {
+            return;
+        }
+        final Scenario scenario = currentScenario.get();
+        usingReadLock(() -> {
+            final List<String> uuids = scenarioUuids.getOrDefault(scenario, emptyList());
+            uuids.forEach(this::stopTestCase);
+        });
+        currentScenario.remove();
+        usingWriteLock(() -> scenarioUuids.remove(scenario));
+    }
+
+    @Override
+    public void beforeStep(final Step step) {
+        final String stepUuid = UUID.randomUUID().toString();
+        getLifecycle().startStep(stepUuid, new StepResult().setName(step.getStepAsString()));
+    }
+
+    @Override
+    public void successful(final String step) {
+        getLifecycle().updateTestCase(result -> result.setStatus(Status.PASSED));
+        getLifecycle().updateStep(result -> result.setStatus(Status.PASSED));
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void ignorable(final String step) {
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void pending(final StepCreator.PendingStep step) {
+        getLifecycle().updateStep(result -> result.setStatus(Status.SKIPPED));
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void notPerformed(final String step) {
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void failed(final String step, final Throwable cause) {
+        final Throwable unwrapped = cause instanceof UUIDExceptionWrapper
+                ? cause.getCause()
+                : cause;
+
+
+        final Status status = getStatus(unwrapped).orElse(Status.FAILED);
+        final StatusDetails statusDetails = getStatusDetails(unwrapped).orElseGet(StatusDetails::new);
+
+        getLifecycle().updateStep(result -> {
+            result.setStatus(status);
+            result.setStatusDetails(statusDetails);
+        });
+
+        getLifecycle().updateTestCase(result -> {
+            result.setStatus(status);
+            result.setStatusDetails(statusDetails);
+        });
+
+        getLifecycle().stopStep();
+    }
+
+
+    public AllureLifecycle getLifecycle() {
+        return lifecycle;
+    }
+
+    protected void startTestCase(final String uuid,
+                                 final Scenario scenario,
+                                 final Map<String, String> tableRow) {
+        final Story story = currentStory.get();
+
+        final String name = scenario.getTitle();
+        final String fullName = String.format("%s: %s", story.getName(), name);
+
+        final List<Parameter> parameters = tableRow.entrySet().stream()
+                .map(entry -> createParameter(entry.getKey(), entry.getValue()))
+                .collect(Collectors.toList());
+
+        final List<Label> labels = new ArrayList<>(Arrays.asList(
+                createStoryLabel(story.getName()),
+                createHostLabel(),
+                createThreadLabel(),
+                createFrameworkLabel("jbehave"),
+                createLanguageLabel("java")
+        ));
+
+        labels.addAll(ResultsUtils.getProvidedLabels());
+
+        final String historyId = getHistoryId(fullName, parameters);
+
+        final TestResult result = new TestResult()
+                .setUuid(uuid)
+                .setName(name)
+                .setFullName(fullName)
+                .setStage(Stage.SCHEDULED)
+                .setLabels(labels)
+                .setParameters(parameters)
+                .setDescription(story.getDescription().asString())
+                .setHistoryId(historyId);
+
+        getLifecycle().scheduleTestCase(result);
+        getLifecycle().startTestCase(result.getUuid());
+    }
+
+    protected void stopTestCase(final String uuid) {
+        getLifecycle().stopTestCase(uuid);
+        getLifecycle().writeTestCase(uuid);
+    }
+
+    protected boolean notParameterised(final Scenario scenario) {
+        return scenario.getExamplesTable().getRowCount() == 0;
+    }
+
+    protected String getHistoryId(final String fullName, final List<Parameter> parameters) {
+        final MessageDigest digest = getMd5Digest();
+        digest.update(fullName.getBytes(UTF_8));
+        parameters.stream()
+                .sorted(comparing(Parameter::getName).thenComparing(Parameter::getValue))
+                .forEachOrdered(parameter -> {
+                    digest.update(parameter.getName().getBytes(UTF_8));
+                    digest.update(parameter.getValue().getBytes(UTF_8));
+                });
+        final byte[] bytes = digest.digest();
+        return bytesToHex(bytes);
+    }
+
+    private boolean isGivenStory() {
+        return !givenStories.get().isEmpty();
+    }
+
+    private void usingReadLock(final Runnable runnable) {
+        lock.readLock().lock();
+        try {
+            runnable.run();
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    private void usingWriteLock(final Runnable runnable) {
+        lock.writeLock().lock();
+        try {
+            runnable.run();
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+}
diff --git a/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml b/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
new file mode 100644
index 000000000..54bff8ab3
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -0,0 +1,351 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5;
+
+import io.qameta.allure.Issue;
+import io.qameta.allure.jbehave5.samples.BrokenStorySteps;
+import io.qameta.allure.jbehave5.samples.RuntimeApiSteps;
+import io.qameta.allure.jbehave5.samples.SimpleStorySteps;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import org.jbehave.core.configuration.MostUsefulConfiguration;
+import org.jbehave.core.embedder.Embedder;
+import org.jbehave.core.embedder.EmbedderControls;
+import org.jbehave.core.embedder.NullEmbedderMonitor;
+import org.jbehave.core.io.LoadFromClasspath;
+import org.jbehave.core.reporters.NullStoryReporter;
+import org.jbehave.core.reporters.StoryReporterBuilder;
+import org.jbehave.core.steps.InjectableStepsFactory;
+import org.jbehave.core.steps.InstanceStepsFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+class AllureJbehave5Test {
+
+    @TempDir
+    Path temp;
+
+    @Test
+    void shouldSetName() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder("Add a to b");
+
+    }
+
+    @Test
+    void shouldAddNotPerformedSteps() {
+        final AllureResults results = runStories("stories/long.story");
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("And b is 10", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 20", Status.FAILED),
+                        tuple("Then result is 21", null),
+                        tuple("Then result is 22", null),
+                        tuple("Then result is 23", null),
+                        tuple("When I add a to b", null),
+                        tuple("Then result is 25", null)
+                );
+
+    }
+
+    @Test
+    void shouldSetStatus() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.PASSED);
+    }
+
+
+    @Test
+    void shouldSetFailedStatus() {
+        final AllureResults results = runStories("stories/failed.story");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.FAILED);
+    }
+
+    @Test
+    void shouldSetStatusDetails() {
+        final AllureResults results = runStories("stories/failed.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatusDetails)
+                .extracting(StatusDetails::getMessage)
+                .containsExactlyInAnyOrder("expected: <15> but was: <123>");
+    }
+
+    @Test
+    void shouldSetBrokenStatus() {
+        final AllureResults results = runStories("stories/broken.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.BROKEN);
+    }
+
+    @Test
+    void shouldSetStage() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStage)
+                .containsExactlyInAnyOrder(Stage.FINISHED);
+    }
+
+    @Test
+    void shouldSetStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runStories("stories/simple.story");
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runStories("stories/simple.story");
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetFullName() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getFullName)
+                .containsExactlyInAnyOrder("simple.story: Add a to b");
+    }
+
+    @Test
+    void shouldSetDescription() {
+        final AllureResults results = runStories("stories/description.story");
+
+        final String expected = "This is description for current story.\n"
+                                + "It should appear on each scenario in report";
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected,
+                        expected
+                );
+    }
+
+    @Issue("238")
+    @Test
+    void shouldNotFailOnComments() {
+        final AllureResults results = runStories("stories/comment.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
+
+    }
+
+    @Test
+    void shouldProcessNotImplementedScenario() {
+        final AllureResults results = runStories("stories/undefined.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not implemented", null)
+                );
+    }
+
+    @Issue("145")
+    @Test
+    void shouldAddParametersFromExamples() {
+        final AllureResults results = runStories("stories/examples.story");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+
+    }
+
+    @Test
+    void shouldRunMultiplyScenarios() {
+        final AllureResults results = runStories("stories/multiply.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("First", Status.PASSED),
+                        tuple("Second", Status.PASSED),
+                        tuple("Third", Status.PASSED)
+                );
+
+    }
+
+    @Issue("163")
+    @Test
+    void shouldNotFailIfGivenStoriesSpecified() {
+        final AllureResults results = runStories("stories/given.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactly(tuple("Add a to b", Status.PASSED));
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "Given a is 5",
+                        "Given b is 10",
+                        "When I add a to b",
+                        "Then result is 15"
+                );
+
+    }
+
+    @Test
+    void shouldSupportRuntimeApiInSteps() {
+        final AllureResults results = runStories("stories/runtimeapi.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactly(tuple("Runtime API", Status.PASSED));
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("jbehave-test-label", "some-value")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getSteps)
+                .filteredOn("name", "Given runtime api")
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactlyInAnyOrder("sub step 1", "sub step 2");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("test param", "param value")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getSteps)
+                .filteredOn("name", "Given runtime api")
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .containsExactlyInAnyOrder("some attachment");
+    }
+
+    private AllureResults runStories(final String... storyResources) {
+        return RunUtils.runTests(lifecycle -> {
+            final Embedder embedder = new Embedder();
+            embedder.useEmbedderMonitor(new NullEmbedderMonitor());
+            embedder.useEmbedderControls(new EmbedderControls()
+                    .doGenerateViewAfterStories(false)
+                    .doFailOnStoryTimeout(false)
+                    .doBatch(false)
+                    .doIgnoreFailureInStories(true)
+                    .doIgnoreFailureInView(true)
+                    .doVerboseFailures(false)
+                    .doVerboseFiltering(false)
+            );
+            final AllureJbehave5 allureJbehave5 = new AllureJbehave5(lifecycle);
+            embedder.useConfiguration(new MostUsefulConfiguration()
+                    .useStoryLoader(new LoadFromClasspath(this.getClass()))
+                    .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
+                            .withReporters(allureJbehave5)
+                    )
+                    .useDefaultStoryReporter(new NullStoryReporter())
+            );
+            final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
+                    embedder.configuration(),
+                    new SimpleStorySteps(),
+                    new BrokenStorySteps(),
+                    new RuntimeApiSteps()
+            );
+            embedder.useStepsFactory(stepsFactory);
+            embedder.runStoriesAsPaths(Arrays.asList(storyResources));
+        });
+    }
+
+    static class ReportlessStoryReporterBuilder extends StoryReporterBuilder {
+
+        private final File outputDirectory;
+
+        ReportlessStoryReporterBuilder(final File outputDirectory) {
+            this.outputDirectory = outputDirectory;
+        }
+
+        @Override
+        public File outputDirectory() {
+            return outputDirectory;
+        }
+    }
+}
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
new file mode 100644
index 000000000..3389fe420
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
@@ -0,0 +1,93 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5;
+
+import org.jbehave.core.model.GivenStories;
+import org.jbehave.core.model.Scenario;
+import org.jbehave.core.model.Step;
+import org.jbehave.core.model.Story;
+import org.jbehave.core.reporters.NullStoryReporter;
+import org.jbehave.core.steps.Timing;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+@SuppressWarnings("unused")
+class LoggingReporter extends NullStoryReporter {
+
+    private final AtomicInteger indentSize = new AtomicInteger(0);
+
+    @Override
+    public void beforeStory(final Story story, final boolean givenStory) {
+        log("beforeStory", story.getName(), givenStory);
+    }
+
+    @Override
+    public void beforeGivenStories() {
+        log("beforeGivenStories");
+    }
+
+    @Override
+    public void givenStories(final GivenStories givenStories) {
+        log("givenStories", givenStories.asString());
+    }
+
+    @Override
+    public void afterGivenStories() {
+        log("afterGivenStories");
+    }
+
+    @Override
+    public void beforeScenario(final Scenario scenario) {
+        log("beforeScenario", scenario.getTitle());
+        indentSize.incrementAndGet();
+    }
+
+    @Override
+    public void afterScenario(final Timing timing) {
+        log("afterScenario");
+        indentSize.decrementAndGet();
+    }
+
+    @Override
+    public void beforeStep(final Step step) {
+        log("step", step);
+    }
+
+    @Override
+    public void example(final Map<String, String> tableRow, final int exampleIndex) {
+        log("example", tableRow);
+    }
+
+    private void log(final Object... objects) {
+        final int value = indentSize.get();
+        final String string = Stream.concat(
+                Stream.of(indent(value)),
+                Stream.of(objects).map(Objects::toString)
+        ).collect(Collectors.joining(" "));
+        System.out.println(string);
+    }
+
+    private static String indent(final int count) {
+        return IntStream.range(0, count)
+                .mapToObj(i -> "    ")
+                .collect(Collectors.joining());
+    }
+}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BrokenFeatureSteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
similarity index 74%
rename from allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BrokenFeatureSteps.java
rename to allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
index f015d4255..e1a0b5e2b 100644
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BrokenFeatureSteps.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,16 +13,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber3jvm.samples;
+package io.qameta.allure.jbehave5.samples;
 
-import cucumber.api.java.en.Given;
+import org.jbehave.core.annotations.Given;
 
-/**
- * @author charlie (Dmitry Baev).
- */
-public class BrokenFeatureSteps {
+public class BrokenStorySteps {
 
-    @Given("^everything is broken$")
+    @Given("everything is broken")
     public void everythingIsBroken() {
         throw new RuntimeException("Oops");
     }
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
similarity index 53%
rename from allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
rename to allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
index e37bf5b71..9711b4caf 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,31 +13,22 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package ru.yandex.qatools.allure.model;
+package io.qameta.allure.jbehave5.samples;
 
-/**
- * Severity level.
- */
-public enum SeverityLevel {
-
-    BLOCKER("blocker"),
-
-    CRITICAL("critical"),
-
-    NORMAL("normal"),
+import io.qameta.allure.Allure;
+import org.jbehave.core.annotations.Given;
 
-    MINOR("minor"),
+public class RuntimeApiSteps {
 
-    TRIVIAL("trivial");
-
-    private final String value;
-
-    SeverityLevel(final String v) {
-        value = v;
-    }
+    @Given("runtime api")
+    public void given() {
+        Allure.label("jbehave-test-label", "some-value");
+        Allure.parameter("test param", "param value");
+        Allure.step("sub step 1");
+        Allure.step("sub step 2", () -> {
+        });
 
-    public String value() {
-        return value;
+        Allure.addAttachment("some attachment", "some content");
     }
 
 }
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/SimpleFeatureSteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
similarity index 72%
rename from allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/SimpleFeatureSteps.java
rename to allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
index 418102391..99aab03b3 100644
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/SimpleFeatureSteps.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,39 +13,36 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumberjvm.samples;
+package io.qameta.allure.jbehave5.samples;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import org.jbehave.core.annotations.Given;
+import org.jbehave.core.annotations.Then;
+import org.jbehave.core.annotations.When;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * @author charlie (Dmitry Baev).
- */
-public class SimpleFeatureSteps {
+public class SimpleStorySteps {
 
     private int a;
     private int b;
     private int c;
 
-    @Given("^a is (\\d+)$")
+    @Given("a is $number")
     public void a_is(int arg1) {
         this.a = arg1;
     }
 
-    @Given("^b is (\\d+)$")
+    @Given("b is $number")
     public void b_is(int arg1) {
         this.b = arg1;
     }
 
-    @When("^I add a to b$")
+    @When("I add a to b")
     public void i_add_a_to_b() {
         this.c = this.a + this.b;
     }
 
-    @Then("^result is (\\d+)$")
+    @Then("result is $number")
     public void result_is(int arg1) {
         assertEquals(this.c, arg1);
     }
diff --git a/allure-java-migration/src/test/resources/allure.properties b/allure-jbehave5/src/test/resources/allure.properties
similarity index 100%
rename from allure-java-migration/src/test/resources/allure.properties
rename to allure-jbehave5/src/test/resources/allure.properties
diff --git a/allure-jbehave5/src/test/resources/simplelogger.properties b/allure-jbehave5/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..7580c4f07
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/simplelogger.properties
@@ -0,0 +1,3 @@
+org.slf4j.simpleLogger.log.org.reflections=off
+org.slf4j.simpleLogger.showLogName=false
+org.slf4j.simpleLogger.showThreadName=false
\ No newline at end of file
diff --git a/allure-jbehave5/src/test/resources/stories/broken.story b/allure-jbehave5/src/test/resources/stories/broken.story
new file mode 100644
index 000000000..e263312db
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/broken.story
@@ -0,0 +1,2 @@
+Scenario: Exception during step
+Given everything is broken
diff --git a/allure-jbehave5/src/test/resources/stories/comment.story b/allure-jbehave5/src/test/resources/stories/comment.story
new file mode 100644
index 000000000..0674d5c1e
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/comment.story
@@ -0,0 +1,7 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+!-- When I add a to b
+Then result is 15
diff --git a/allure-jbehave5/src/test/resources/stories/description.story b/allure-jbehave5/src/test/resources/stories/description.story
new file mode 100644
index 000000000..3b04280a6
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/description.story
@@ -0,0 +1,17 @@
+This is description for current story.
+It should appear on each scenario in report
+
+Scenario: Add a to b (1)
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 15
+
+Scenario: Add a to b (2)
+
+Given a is 1
+And b is 2
+When I add a to b
+Then result is 3
+
diff --git a/allure-jbehave5/src/test/resources/stories/examples.story b/allure-jbehave5/src/test/resources/stories/examples.story
new file mode 100644
index 000000000..22a4f9b96
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/examples.story
@@ -0,0 +1,11 @@
+Scenario: Scenario with Positive Examples
+
+Given a is <a>
+And b is <b>
+When I add a to b
+Then result is <result>
+
+Examples:
+| a | b | result |
+| 1 | 3 | 4      |
+| 2 | 4 | 6      |
diff --git a/allure-jbehave5/src/test/resources/stories/failed.story b/allure-jbehave5/src/test/resources/stories/failed.story
new file mode 100644
index 000000000..5b33b75d7
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/failed.story
@@ -0,0 +1,6 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 123
diff --git a/allure-jbehave5/src/test/resources/stories/given.story b/allure-jbehave5/src/test/resources/stories/given.story
new file mode 100644
index 000000000..2fc2feb0c
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/given.story
@@ -0,0 +1,5 @@
+Scenario: Add a to b
+GivenStories:stories/precondition-a.story,stories/precondition-b.story
+
+When I add a to b
+Then result is 15
diff --git a/allure-jbehave5/src/test/resources/stories/long.story b/allure-jbehave5/src/test/resources/stories/long.story
new file mode 100644
index 000000000..88f529253
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/long.story
@@ -0,0 +1,14 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 15
+Then result is 15
+When I add a to b
+Then result is 20
+Then result is 21
+Then result is 22
+Then result is 23
+When I add a to b
+Then result is 25
diff --git a/allure-jbehave5/src/test/resources/stories/multiply.story b/allure-jbehave5/src/test/resources/stories/multiply.story
new file mode 100644
index 000000000..4aecb435b
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/multiply.story
@@ -0,0 +1,20 @@
+Scenario: First
+
+Given a is 2
+And b is 2
+When I add a to b
+Then result is 4
+
+Scenario: Second
+
+Given a is 3
+And b is 7
+When I add a to b
+Then result is 10
+
+Scenario: Third
+
+Given a is 5
+And b is -5
+When I add a to b
+Then result is 0
diff --git a/allure-jbehave5/src/test/resources/stories/precondition-a.story b/allure-jbehave5/src/test/resources/stories/precondition-a.story
new file mode 100644
index 000000000..9defc653a
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/precondition-a.story
@@ -0,0 +1,3 @@
+Scenario: Init a
+
+Given a is 5
diff --git a/allure-jbehave5/src/test/resources/stories/precondition-b.story b/allure-jbehave5/src/test/resources/stories/precondition-b.story
new file mode 100644
index 000000000..30af31190
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/precondition-b.story
@@ -0,0 +1,3 @@
+Scenario: Init b
+
+Given b is 10
diff --git a/allure-jbehave5/src/test/resources/stories/runtimeapi.story b/allure-jbehave5/src/test/resources/stories/runtimeapi.story
new file mode 100644
index 000000000..305c5ae1c
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/runtimeapi.story
@@ -0,0 +1,3 @@
+Scenario: Runtime API
+
+Given runtime api
diff --git a/allure-jbehave5/src/test/resources/stories/simple.story b/allure-jbehave5/src/test/resources/stories/simple.story
new file mode 100644
index 000000000..b76d831aa
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/simple.story
@@ -0,0 +1,6 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 15
diff --git a/allure-jbehave5/src/test/resources/stories/undefined.story b/allure-jbehave5/src/test/resources/stories/undefined.story
new file mode 100644
index 000000000..5a193a746
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/undefined.story
@@ -0,0 +1,2 @@
+Scenario: Step is not implemented
+Given hello my friend
diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
new file mode 100644
index 000000000..5cbce74ae
--- /dev/null
+++ b/allure-jooq/build.gradle.kts
@@ -0,0 +1,36 @@
+description = "Allure JOOQ Integration"
+
+val jooqVersion = "3.19.10"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    compileOnly("org.jooq:jooq:${jooqVersion}")
+    testImplementation("io.zonky.test:embedded-postgres:2.2.0")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.jooq:jooq:${jooqVersion}")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:18.1.0"))
+    testImplementation(project(":allure-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.postgresql:postgresql:42.7.7")
+}
+
+tasks.compileJava {
+    options.release.set(17)
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.jooq"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
new file mode 100644
index 000000000..3498deb2b
--- /dev/null
+++ b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
@@ -0,0 +1,143 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jooq;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import org.jooq.ExecuteContext;
+import org.jooq.ExecuteListener;
+import org.jooq.Formattable;
+import org.jooq.Query;
+import org.jooq.Record;
+import org.jooq.Routine;
+
+import java.util.Objects;
+import java.util.UUID;
+
+import static java.lang.Boolean.FALSE;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings("PMD.NonSerializableClass")
+public class AllureJooq implements ExecuteListener {
+
+    private static final String STEP_UUID
+            = "io.qameta.allure.jooq.AllureJooq.STEP_UUID";
+    private static final String DO_BUFFER
+            = "io.qameta.allure.jooq.AllureJooq.DO_BUFFER";
+
+    private final AllureLifecycle lifecycle;
+
+    public AllureJooq() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureJooq(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void renderEnd(final ExecuteContext ctx) {
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        final String stepName = stepName(ctx);
+        final String uuid = UUID.randomUUID().toString();
+        ctx.data(STEP_UUID, uuid);
+        lifecycle.startStep(uuid, new StepResult()
+                .setName(stepName)
+        );
+    }
+
+    private String stepName(final ExecuteContext ctx) {
+        final Query query = ctx.query();
+        if (query != null) {
+            return ctx.dsl().renderInlined(query);
+        }
+
+        final Routine<?> routine = ctx.routine();
+        if (ctx.routine() != null) {
+            return ctx.dsl().renderInlined(routine);
+        }
+
+        final String sql = ctx.sql();
+        if (Objects.nonNull(sql) && !sql.isEmpty()) {
+            return sql;
+        }
+
+        final String[] batchSQL = ctx.batchSQL();
+        if (batchSQL.length > 0 && batchSQL[batchSQL.length - 1] != null) {
+            return String.join("\n", batchSQL);
+        }
+        return "UNKNOWN";
+    }
+
+    @Override
+    public void recordEnd(final ExecuteContext ctx) {
+        if (ctx.recordLevel() > 0) {
+            return;
+        }
+
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        final Record record = ctx.record();
+        if (record != null && !FALSE.equals(ctx.data(DO_BUFFER))) {
+            attachResultSet(record);
+        }
+    }
+
+    @Override
+    public void resultStart(final ExecuteContext ctx) {
+        ctx.data(DO_BUFFER, false);
+    }
+
+    @Override
+    public void resultEnd(final ExecuteContext ctx) {
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        attachResultSet(ctx.result());
+    }
+
+    @Override
+    public void end(final ExecuteContext ctx) {
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        final String stepUuid = (String) ctx.data(STEP_UUID);
+        if (Objects.isNull(stepUuid)) {
+            return;
+        }
+
+        lifecycle.updateStep(stepUuid, sr -> sr.setStatus(Status.PASSED));
+        lifecycle.stopStep(stepUuid);
+    }
+
+    private void attachResultSet(final Formattable formattable) {
+        if (Objects.nonNull(formattable)) {
+            Allure.addAttachment("ResultSet", "text/csv", formattable.formatCSV());
+        }
+    }
+
+}
diff --git a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
new file mode 100644
index 000000000..d4e6f853e
--- /dev/null
+++ b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
@@ -0,0 +1,136 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jooq;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import io.zonky.test.db.postgres.embedded.EmbeddedPostgres;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.SQLDialect;
+import org.jooq.Table;
+import org.jooq.impl.DSL;
+import org.jooq.impl.DataSourceConnectionProvider;
+import org.jooq.impl.DefaultConfiguration;
+import org.jooq.impl.DefaultDSLContext;
+import org.jooq.impl.SQLDataType;
+import org.junit.jupiter.api.Test;
+
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Consumer;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class AllureJooqTest {
+
+    @Test
+    void shouldSupportFetchSqlStatements() {
+        final AllureResults results = execute(dsl -> dsl.fetchSingle("select 1"));
+
+        final TestResult result = results.getTestResults().get(0);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("select 1", Status.PASSED)
+                );
+    }
+
+    @Test
+    void shouldAddResultSetsAsAttachments() {
+        final AllureResults results = execute(dsl -> dsl.fetchSingle("select 1 as one, 2 as two"));
+        final TestResult result = results.getTestResults().get(0);
+        final StepResult step = result.getSteps().get(0);
+        assertThat(step.getAttachments())
+                .extracting(Attachment::getName, Attachment::getType)
+                .containsExactly(
+                        tuple("ResultSet", "text/csv")
+                );
+
+        final Attachment attachment = step.getAttachments().get(0);
+
+        final byte[] content = results.getAttachments().get(attachment.getSource());
+
+        assertThat(new String(content, StandardCharsets.UTF_8))
+                .contains("one,two\n1,2\n");
+
+    }
+
+    @Test
+    void shouldSupportCreateTableStatements() {
+        final AllureResults results = execute(dsl -> {
+            final Name tableName = DSL.name("first_table");
+            final Field<Long> id = DSL.field("id", SQLDataType.BIGINT);
+            final Field<String> name = DSL.field("name", SQLDataType.VARCHAR);
+            dsl.createTable(tableName)
+                    .column(id)
+                    .column(name)
+                    .primaryKey(id)
+                    .execute();
+
+            final Table<Record> table = DSL.table(tableName);
+
+            dsl.insertInto(table, id, name)
+                    .values(1L, "first")
+                    .values(2L, "second")
+                    .execute();
+        });
+
+        final TestResult result = results.getTestResults().get(0);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("create table \"first_table\" (id bigint, name varchar, primary key (id))", Status.PASSED),
+                        tuple("insert into \"first_table\" (id, name) values (1, 'first'), (2, 'second')", Status.PASSED)
+                );
+    }
+
+    private static AllureResults execute(final Consumer<DSLContext> dslContextConsumer) {
+        final EmbeddedPostgres.Builder builder = EmbeddedPostgres.builder();
+        try (EmbeddedPostgres postgres = builder.start()) {
+            final DataSource dataSource = postgres.getPostgresDatabase();
+
+            final DataSourceConnectionProvider connectionProvider = new DataSourceConnectionProvider(dataSource);
+            final DefaultConfiguration configuration = new DefaultConfiguration();
+            configuration.set(SQLDialect.POSTGRES);
+            configuration.set(connectionProvider);
+
+            return runWithinTestContext(
+                    () -> {
+                        final DefaultDSLContext dsl = new DefaultDSLContext(configuration);
+                        dslContextConsumer.accept(dsl);
+                    },
+                    Allure::setLifecycle,
+                    allureLifecycle -> configuration.setExecuteListener(new AllureJooq(allureLifecycle))
+            );
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+}
diff --git a/allure-jooq/src/test/resources/simplelogger.properties b/allure-jooq/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..3ae9a5745
--- /dev/null
+++ b/allure-jooq/src/test/resources/simplelogger.properties
@@ -0,0 +1,2 @@
+org.slf4j.simpleLogger.log.org.jooq.Constants=warn
+org.slf4j.simpleLogger.log.org.jooq.tools.LoggerListener=info
diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index 1d46c094b..ab22c0f6e 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -1,15 +1,12 @@
 description = "Allure JsonUnit Integration"
 
-val agent: Configuration by configurations.creating
-
-val jsonUnitVersion = "2.11.1"
+val jsonUnitVersion = "2.35.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
+    compileOnly("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
     implementation("com.fasterxml.jackson.core:jackson-databind")
-    implementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
-    implementation("org.apache.commons:commons-lang3")
+    testImplementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
@@ -29,8 +26,5 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
index 875adf470..329dbc6c8 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,13 +20,15 @@
 import org.hamcrest.Matcher;
 
 import net.javacrumbs.jsonunit.core.Configuration;
+import net.javacrumbs.jsonunit.core.ConfigurationWhen.ApplicableForPath;
+import net.javacrumbs.jsonunit.core.ConfigurationWhen.PathsParam;
 import net.javacrumbs.jsonunit.core.Option;
 import net.javacrumbs.jsonunit.core.internal.Diff;
 import net.javacrumbs.jsonunit.core.internal.Options;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
 
 /**
- * Сontains basic matcher functionality and implementation of methods for matching configuration.
+ * Contains basic matcher functionality and implementation of methods for matching configuration.
  *
  * @param <T> the type
  */
@@ -54,6 +56,11 @@ public T when(final Option first, final Option... next) {
         return (T) this;
     }
 
+    public T when(final PathsParam pathsParam, final ApplicableForPath... applicableForPaths) {
+        this.configuration = this.configuration.when(pathsParam, applicableForPaths);
+        return (T) this;
+    }
+
     public T withOptions(final Options options) {
         this.configuration = configuration.withOptions(options);
         return (T) this;
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
index 05871c70d..3b95e3348 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@
 /**
  * @param <T> the type of matcher
  * @see net.javacrumbs.jsonunit.ConfigurableJsonMatcher
+ * @deprecated Use {@link net.javacrumbs.jsonunit.ConfigurableJsonMatcher}
  */
+@Deprecated
 public interface AllureConfigurableJsonMatcher<T> extends Matcher<T> {
 
     AllureConfigurableJsonMatcher<T> withTolerance(BigDecimal tolerance);
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
index bd7e7b60c..c747b1121 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
index 514a0215e..3a65e6012 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
index df7a7dc49..ea1aaf899 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import net.javacrumbs.jsonunit.core.listener.Difference;
 import net.javacrumbs.jsonunit.core.listener.DifferenceContext;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.UncheckedIOException;
 import java.util.ArrayList;
@@ -124,7 +123,7 @@ public String getJsonPatch() {
             final String field = getPath(difference);
             Map<String, Object> currentMap = jsonDiffPatch;
 
-            final String fieldWithDots = StringUtils.replace(field, "[", ".");
+            final String fieldWithDots = field.replace('[', '.');
             final int len = fieldWithDots.length();
             int left = 0;
             int right = 0;
@@ -134,7 +133,7 @@ public String getJsonPatch() {
                     right = len;
                 }
                 String fieldName = fieldWithDots.substring(left, right);
-                fieldName = StringUtils.remove(fieldName, "]");
+                fieldName = fieldName.replaceAll("]", "");
 
                 if (right != len) {
                     if (!fieldName.isEmpty()) {
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
index 34d154682..78bed71ed 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import net.javacrumbs.jsonunit.ConfigurableJsonMatcher;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
 
 import org.hamcrest.Description;
@@ -28,8 +29,8 @@
  * @param <T> the type
  */
 @SuppressWarnings("unused")
-public final class JsonPatchMatcher<T> extends AbstractJsonPatchMatcher<AllureConfigurableJsonMatcher<T>>
-        implements AllureConfigurableJsonMatcher<T> {
+public final class JsonPatchMatcher<T> extends AbstractJsonPatchMatcher<ConfigurableJsonMatcher<T>>
+        implements ConfigurableJsonMatcher<T> {
 
     private final Object expected;
 
@@ -37,7 +38,7 @@ private JsonPatchMatcher(final Object expected) {
         this.expected = expected;
     }
 
-    public static <T> AllureConfigurableJsonMatcher<T> jsonEquals(final Object expected) {
+    public static <T> ConfigurableJsonMatcher<T> jsonEquals(final Object expected) {
         return new JsonPatchMatcher<T>(expected);
     }
 
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
index 28f3cb80e..4b6b043ac 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
index 7959ddcf9..29e85869d 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
index 2cf696e6f..4cf244bf2 100644
--- a/allure-junit-platform/build.gradle.kts
+++ b/allure-junit-platform/build.gradle.kts
@@ -1,12 +1,11 @@
 description = "Allure JUnit Platform Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.junit.platform:junit-platform-launcher")
+    implementation(project(":allure-test-filter"))
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
@@ -33,19 +32,17 @@ tasks.test {
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/features/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
-val spiOffJar by tasks.creating(Jar::class) {
+val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
-    classifier = "spi-off"
+    archiveClassifier.set("spi-off")
 }
 
-val spiOff by configurations.creating {
-    extendsFrom(configurations.getByName("compile"))
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
 }
-
-artifacts.add("archives", spiOffJar)
-artifacts.add("spiOff", spiOffJar)
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index 74b5def2c..352cf2a42 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import io.qameta.allure.SeverityLevel;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Stage;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
@@ -33,6 +34,7 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.TestTag;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
@@ -46,8 +48,10 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -64,6 +68,7 @@
 import static io.qameta.allure.model.Status.FAILED;
 import static io.qameta.allure.model.Status.PASSED;
 import static io.qameta.allure.model.Status.SKIPPED;
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
 import static io.qameta.allure.util.ResultsUtils.createHostLabel;
 import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
@@ -79,29 +84,67 @@
 /**
  * @author ehborisov
  */
-@SuppressWarnings({"deprecation", "ClassFanOutComplexity", "MultipleStringLiterals", "PMD.GodClass"})
+@SuppressWarnings({
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+        "MultipleStringLiterals",
+})
 public class AllureJunitPlatform implements TestExecutionListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatform.class);
+    public static final String ALLURE_REPORT_ENTRY_BLANK_PREFIX
+            = "ALLURE_REPORT_ENTRY_BLANK_PREFIX__";
 
-    public static final String ALLURE_FIXTURE = "allure.fixture";
+    public static final String ALLURE_PARAMETER = "allure.parameter";
+    public static final String ALLURE_PARAMETER_VALUE_KEY = "value";
+    public static final String ALLURE_PARAMETER_MODE_KEY = "mode";
+    public static final String ALLURE_PARAMETER_EXCLUDED_KEY = "excluded";
 
+    public static final String ALLURE_FIXTURE = "allure.fixture";
     public static final String PREPARE = "prepare";
     public static final String TEAR_DOWN = "tear_down";
-
     public static final String EVENT_START = "start";
     public static final String EVENT_STOP = "stop";
     public static final String EVENT_FAILURE = "failure";
 
+    public static final String JUNIT_PLATFORM_UNIQUE_ID = "junit.platform.uniqueid";
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatform.class);
     private static final String STDOUT = "stdout";
     private static final String STDERR = "stderr";
     private static final String TEXT_PLAIN = "text/plain";
     private static final String TXT_EXTENSION = ".txt";
 
+    private static final boolean HAS_SPOCK2_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.spock2.AllureSpock2");
+
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+
+    private static final String ENGINE_SPOCK2 = "spock";
+    private static final String ENGINE_CUCUMBER = "cucumber";
+
     private final ThreadLocal<TestPlan> testPlanStorage = new InheritableThreadLocal<>();
 
-    private final Uuids tests = new Uuids();
-    private final Uuids containers = new Uuids();
+    private final ThreadLocal<Uuids> tests = new InheritableThreadLocal<Uuids>() {
+        @Override
+        protected Uuids initialValue() {
+            return new Uuids();
+        }
+    };
+    private final ThreadLocal<Uuids> containers = new InheritableThreadLocal<Uuids>() {
+        @Override
+        protected Uuids initialValue() {
+            return new Uuids();
+        }
+    };
 
     private final AllureLifecycle lifecycle;
 
@@ -117,20 +160,73 @@ public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
 
+    @SuppressWarnings({"CyclomaticComplexity", "BooleanExpressionComplexity"})
+    private boolean shouldSkipReportingFor(final TestIdentifier testIdentifier) {
+        // Always skip root
+        if (!testIdentifier.getParentId().isPresent()) {
+            return true;
+        }
+
+        final Optional<String> maybeEngine = getEngine(testIdentifier);
+        // can't find the engine, don't know if it's possible but just in case
+        // keep reporting such nodes.
+        if (!maybeEngine.isPresent()) {
+            return false;
+        }
+
+        final String engine = maybeEngine.get();
+
+
+        return HAS_SPOCK2_IN_CLASSPATH && ENGINE_SPOCK2.equals(engine)
+               || (HAS_CUCUMBERJVM7_IN_CLASSPATH
+                   || HAS_CUCUMBERJVM6_IN_CLASSPATH
+                   || HAS_CUCUMBERJVM5_IN_CLASSPATH
+                   || HAS_CUCUMBERJVM4_IN_CLASSPATH
+                  ) && ENGINE_CUCUMBER.equals(engine);
+    }
+
+    private Optional<String> getEngine(final TestIdentifier testIdentifier) {
+        final UniqueId uniqueId = testIdentifier.getUniqueIdObject();
+        final List<UniqueId.Segment> segments = uniqueId.getSegments();
+        // since junit-platform-suite engine creates nested engine segments
+        // we need to lookup for the last one with type engine
+        // to determinate the actual used engine:
+        // [engine:junit-platform-suite]/[suite:org.example.JUnitRunnerTest]/[engine:cucumber]/...
+        for (int i = segments.size() - 1; i >= 0; i--) {
+            final UniqueId.Segment segment = segments.get(i);
+            if ("engine".equals(segment.getType())) {
+                return Optional.of(segment.getValue());
+            }
+        }
+        return Optional.empty();
+    }
+
+    private static boolean isClassAvailableOnClasspath(final String clazz) {
+        try {
+            AllureJunitPlatform.class.getClassLoader().loadClass(clazz);
+            return true;
+        } catch (Exception ignored) {
+            return false;
+        }
+    }
+
     @Override
     public void testPlanExecutionStarted(final TestPlan testPlan) {
         testPlanStorage.set(testPlan);
+        tests.set(new Uuids());
+        containers.set(new Uuids());
     }
 
     @Override
     public void testPlanExecutionFinished(final TestPlan testPlan) {
         testPlanStorage.remove();
+        tests.remove();
+        containers.remove();
     }
 
     @Override
     public void executionStarted(final TestIdentifier testIdentifier) {
-        // skip root
-        if (!testIdentifier.getParentId().isPresent()) {
+        if (shouldSkipReportingFor(testIdentifier)) {
             return;
         }
         // create container for every TestIdentifier. We need containers for tests in order
@@ -145,8 +241,7 @@ public void executionStarted(final TestIdentifier testIdentifier) {
     @Override
     public void executionFinished(final TestIdentifier testIdentifier,
                                   final TestExecutionResult testExecutionResult) {
-        // skip root
-        if (!testIdentifier.getParentId().isPresent()) {
+        if (shouldSkipReportingFor(testIdentifier)) {
             return;
         }
         final Status status = extractStatus(testExecutionResult);
@@ -167,8 +262,7 @@ public void executionFinished(final TestIdentifier testIdentifier,
     @Override
     public void executionSkipped(final TestIdentifier testIdentifier,
                                  final String reason) {
-        // skip root
-        if (!testIdentifier.getParentId().isPresent()) {
+        if (shouldSkipReportingFor(testIdentifier)) {
             return;
         }
         final TestPlan testPlan = testPlanStorage.get();
@@ -184,40 +278,21 @@ public void executionSkipped(final TestIdentifier testIdentifier,
         );
     }
 
-    @SuppressWarnings({"ReturnCount", "PMD.NcssCount"})
+    @SuppressWarnings({"ReturnCount", "CyclomaticComplexity"})
     @Override
     public void reportingEntryPublished(final TestIdentifier testIdentifier,
                                         final ReportEntry entry) {
-        final Map<String, String> keyValuePairs = entry.getKeyValuePairs();
-        if (keyValuePairs.containsKey(ALLURE_FIXTURE)) {
-            final String type = keyValuePairs.get(ALLURE_FIXTURE);
-            final String event = keyValuePairs.get("event");
-
-            // skip for invalid events
-            if (Objects.isNull(type) || Objects.isNull(event)) {
-                return;
-            }
+        if (shouldSkipReportingFor(testIdentifier)) {
+            return;
+        }
 
-            switch (event) {
-                case EVENT_START:
-                    final Optional<String> maybeParent = containers.get(testIdentifier);
-                    if (!maybeParent.isPresent()) {
-                        return;
-                    }
-                    final String parentUuid = maybeParent.get();
-                    startFixture(parentUuid, type, keyValuePairs);
-                    return;
-                case EVENT_FAILURE:
-                    failFixture(keyValuePairs);
-                    resetContext(testIdentifier);
-                    return;
-                case EVENT_STOP:
-                    stopFixture(keyValuePairs);
-                    resetContext(testIdentifier);
-                    return;
-                default:
-                    break;
-            }
+        final Map<String, String> keyValuePairs = unwrap(entry.getKeyValuePairs());
+        if (keyValuePairs.containsKey(ALLURE_FIXTURE)) {
+            processFixtureEvent(testIdentifier, keyValuePairs);
+            return;
+        }
+        if (keyValuePairs.containsKey(ALLURE_PARAMETER)) {
+            processParameterEvent(keyValuePairs);
             return;
         }
 
@@ -232,12 +307,92 @@ public void reportingEntryPublished(final TestIdentifier testIdentifier,
 
     }
 
+    @SuppressWarnings("PMD.InefficientEmptyStringCheck")
+    private Map<String, String> unwrap(final Map<String, String> data) {
+        final Map<String, String> res = new HashMap<>();
+        data.forEach((key, value) -> {
+                    if (Objects.nonNull(value)
+                        && value.trim().isEmpty()
+                        && value.startsWith(ALLURE_REPORT_ENTRY_BLANK_PREFIX)) {
+                        res.put(key, value.substring(ALLURE_REPORT_ENTRY_BLANK_PREFIX.length()));
+                    } else {
+                        res.put(key, value);
+                    }
+                }
+        );
+        return res;
+    }
+
+    private void processParameterEvent(final Map<String, String> keyValuePairs) {
+        final String name = keyValuePairs.get(ALLURE_PARAMETER);
+        final String value = keyValuePairs.get(ALLURE_PARAMETER_VALUE_KEY);
+        final Parameter parameter;
+        if (Objects.nonNull(value) && value.startsWith(ALLURE_REPORT_ENTRY_BLANK_PREFIX)) {
+            parameter = ResultsUtils.createParameter(
+                    name,
+                    value.substring(ALLURE_REPORT_ENTRY_BLANK_PREFIX.length())
+            );
+        } else {
+            parameter = ResultsUtils.createParameter(name, value);
+        }
+        if (keyValuePairs.containsKey(ALLURE_PARAMETER_MODE_KEY)) {
+            final String modeString = keyValuePairs.get(ALLURE_PARAMETER_MODE_KEY);
+            Stream.of(Parameter.Mode.values())
+                    .filter(mode -> mode.name().equalsIgnoreCase(modeString))
+                    .findAny()
+                    .ifPresent(parameter::setMode);
+        }
+        if (keyValuePairs.containsKey(ALLURE_PARAMETER_EXCLUDED_KEY)) {
+            final String excludedString = keyValuePairs.get(ALLURE_PARAMETER_EXCLUDED_KEY);
+            Optional.ofNullable(excludedString)
+                    .map(Boolean::parseBoolean)
+                    .ifPresent(parameter::setExcluded);
+        }
+
+        getLifecycle().updateTestCase(tr -> tr.getParameters()
+                .add(parameter)
+        );
+    }
+
+    @SuppressWarnings({"ReturnCount"})
+    private void processFixtureEvent(final TestIdentifier testIdentifier,
+                                     final Map<String, String> keyValuePairs) {
+        final String type = keyValuePairs.get(ALLURE_FIXTURE);
+        final String event = keyValuePairs.get("event");
+
+        // skip for invalid events
+        if (Objects.isNull(type) || Objects.isNull(event)) {
+            return;
+        }
+
+        switch (event) {
+            case EVENT_START:
+                final Optional<String> maybeParent = getContainer(testIdentifier);
+                if (!maybeParent.isPresent()) {
+                    return;
+                }
+                final String parentUuid = maybeParent.get();
+                startFixture(parentUuid, type, keyValuePairs);
+                return;
+            case EVENT_FAILURE:
+                failFixture(keyValuePairs);
+                resetContext(testIdentifier);
+                return;
+            case EVENT_STOP:
+                stopFixture(keyValuePairs);
+                resetContext(testIdentifier);
+                return;
+            default:
+                break;
+        }
+    }
+
     private void resetContext(final TestIdentifier testIdentifier) {
         // in case of fixtures that reported within a test we need to return current
         // test case uuid to allure thread local storage
         Optional.of(testIdentifier)
                 .filter(TestIdentifier::isTest)
-                .flatMap(tests::get)
+                .flatMap(this::getTest)
                 .ifPresent(Allure.getLifecycle()::setCurrentTestCase);
     }
 
@@ -262,7 +417,7 @@ protected Status getStatus(final Throwable throwable) {
     }
 
     private void startTestContainer(final TestIdentifier testIdentifier) {
-        final String uuid = containers.getOrCreate(testIdentifier);
+        final String uuid = getOrCreateContainer(testIdentifier);
         final TestResultContainer result = new TestResultContainer()
                 .setUuid(uuid)
                 .setName(testIdentifier.getDisplayName());
@@ -271,25 +426,24 @@ private void startTestContainer(final TestIdentifier testIdentifier) {
     }
 
     private void stopTestContainer(final TestIdentifier testIdentifier) {
-        final Optional<String> maybeUuid = containers.get(testIdentifier);
+        final Optional<String> maybeUuid = getContainer(testIdentifier);
         if (!maybeUuid.isPresent()) {
             return;
         }
         final String uuid = maybeUuid.get();
         final TestPlan context = testPlanStorage.get();
-        final Set<String> children = Optional.ofNullable(context)
+        final List<String> children = Optional.ofNullable(context)
                 .map(tp -> tp.getDescendants(testIdentifier))
                 .orElseGet(Collections::emptySet)
                 .stream()
                 .filter(TestIdentifier::isTest)
-                .map(tests::get)
+                .map(this::getTest)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toCollection(HashSet::new));
+                .distinct()
+                .collect(Collectors.toCollection(ArrayList::new));
 
-        if (testIdentifier.isTest()) {
-            tests.get(testIdentifier).ifPresent(children::add);
-        }
+        getTest(testIdentifier).ifPresent(children::add);
 
         getLifecycle().updateTestContainer(uuid, container -> container.setChildren(children));
         getLifecycle().stopTestContainer(uuid);
@@ -347,24 +501,65 @@ private void stopFixture(final Map<String, String> keyValue) {
         getLifecycle().stopFixture(uuid);
     }
 
-    @SuppressWarnings("PMD.NcssCount")
     private void startTestCase(final TestIdentifier testIdentifier) {
-        final String uuid = tests.getOrCreate(testIdentifier);
+        final String uuid = getOrCreateTest(testIdentifier);
 
         final Optional<TestSource> testSource = testIdentifier.getSource();
-        final Optional<Method> testMethod = testSource.flatMap(this::getTestMethod);
-        final Optional<Class<?>> testClass = testSource.flatMap(this::getTestClass);
+        final Optional<Method> testMethod = testSource
+                .flatMap(AllureJunitPlatformUtils::getTestMethod);
+        final Optional<Class<?>> testClass = testSource
+                .flatMap(AllureJunitPlatformUtils::getTestClass);
+
+        final boolean testTemplate = "test-template-invocation"
+                .equals(testIdentifier.getUniqueIdObject().getLastSegment().getType());
+
+        final Optional<TestIdentifier> maybeParent = Optional.of(testPlanStorage)
+                .map(ThreadLocal::get)
+                .flatMap(tp -> tp.getParent(testIdentifier));
 
         final TestResult result = new TestResult()
                 .setUuid(uuid)
-                .setName(testIdentifier.getDisplayName())
+                .setName(testTemplate && maybeParent.isPresent()
+                        ? maybeParent.get().getDisplayName() + " " + testIdentifier.getDisplayName()
+                        : testIdentifier.getDisplayName()
+                )
                 .setLabels(getTags(testIdentifier))
+                .setTestCaseId(testTemplate
+                        ? maybeParent.map(TestIdentifier::getUniqueId)
+                        .orElseGet(testIdentifier::getUniqueId)
+                        : testIdentifier.getUniqueId()
+                )
+                .setTestCaseName(testTemplate
+                        ? maybeParent.map(TestIdentifier::getDisplayName)
+                        .orElseGet(testIdentifier::getDisplayName)
+                        : testIdentifier.getDisplayName())
                 .setHistoryId(getHistoryId(testIdentifier))
                 .setStage(Stage.RUNNING);
 
+        if (testTemplate) {
+            // history id is ignored in Allure TestOps, so we add a hidden parameter
+            // to make sure different results are not considered as retries
+            result.getParameters().add(new Parameter()
+                    .setMode(Parameter.Mode.HIDDEN)
+                    .setName("UniqueId")
+                    .setValue(testIdentifier.getUniqueId())
+            );
+        }
+
         result.getLabels().addAll(getProvidedLabels());
 
-        testClass.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
+        result.getLabels().add(getJUnitPlatformUniqueId(testIdentifier));
+
+        // add annotations from outer classes (support for @Nested tests in JUnit 5)
+        testClass.ifPresent(clazz -> {
+            Class<?> clazz1 = clazz;
+            do {
+                final Set<Label> labels = AnnotationUtils.getLabels(clazz1);
+                result.getLabels().addAll(labels);
+                clazz1 = clazz1.getDeclaringClass();
+            } while (Objects.nonNull(clazz1));
+        });
+
         testMethod.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
 
         testClass.map(AnnotationUtils::getLinks).ifPresent(result.getLinks()::addAll);
@@ -377,7 +572,7 @@ private void startTestCase(final TestIdentifier testIdentifier) {
                 createLanguageLabel("java")
         ));
 
-        testSource.flatMap(this::getFullName).ifPresent(result::setFullName);
+        testSource.flatMap(AllureJunitPlatformUtils::getFullName).ifPresent(result::setFullName);
         testSource.map(this::getSourceLabels).ifPresent(result.getLabels()::addAll);
         testClass.ifPresent(aClass -> {
             final String suiteName = getDisplayName(aClass).orElse(aClass.getCanonicalName());
@@ -403,7 +598,8 @@ private void startTestCase(final TestIdentifier testIdentifier) {
         testMethod.ifPresent(method -> ResultsUtils.processDescription(
                 method.getDeclaringClass().getClassLoader(),
                 method,
-                result
+                result::setDescription,
+                result::setDescriptionHtml
         ));
 
         getLifecycle().scheduleTestCase(result);
@@ -413,15 +609,34 @@ private void startTestCase(final TestIdentifier testIdentifier) {
     private void stopTestCase(final TestIdentifier testIdentifier,
                               final Status status,
                               final StatusDetails statusDetails) {
-        final Optional<String> maybeUuid = tests.get(testIdentifier);
+        final Optional<String> maybeUuid = getTest(testIdentifier);
         if (!maybeUuid.isPresent()) {
             return;
         }
         final String uuid = maybeUuid.get();
         getLifecycle().updateTestCase(uuid, result -> {
+            if (!testIdentifier.isTest()) {
+                result.getLabels().add(new Label().setName(ALLURE_ID_LABEL_NAME).setValue("-1"));
+            }
             result.setStage(Stage.FINISHED);
             result.setStatus(status);
-            result.setStatusDetails(statusDetails);
+
+            final StatusDetails currentSd = result.getStatusDetails();
+            if (Objects.isNull(currentSd)) {
+                result.setStatusDetails(statusDetails);
+            } else if (Objects.nonNull(statusDetails)) {
+                Optional.of(statusDetails)
+                        .map(StatusDetails::getMessage)
+                        .ifPresent(currentSd::setMessage);
+
+                Optional.of(statusDetails)
+                        .map(StatusDetails::getTrace)
+                        .ifPresent(currentSd::setTrace);
+
+                currentSd.setMuted(currentSd.isMuted() || statusDetails.isMuted());
+                currentSd.setFlaky(currentSd.isFlaky() || statusDetails.isFlaky());
+                currentSd.setKnown(currentSd.isKnown() || statusDetails.isKnown());
+            }
         });
         getLifecycle().stopTestCase(uuid);
         getLifecycle().writeTestCase(uuid);
@@ -498,57 +713,30 @@ private List<Label> getSourceLabels(final TestSource source) {
         return Collections.emptyList();
     }
 
-    private Optional<String> getFullName(final TestSource source) {
-        if (source instanceof MethodSource) {
-            final MethodSource ms = (MethodSource) source;
-            return Optional.of(String.format("%s.%s", ms.getClassName(), ms.getMethodName()));
-        }
-        if (source instanceof ClassSource) {
-            final ClassSource cs = (ClassSource) source;
-            return Optional.ofNullable(cs.getClassName());
-        }
-        return Optional.empty();
+    private Label getJUnitPlatformUniqueId(final TestIdentifier testIdentifier) {
+        final Label label = new Label();
+        label.setName(JUNIT_PLATFORM_UNIQUE_ID);
+        label.setValue(testIdentifier.getUniqueId());
+        return label;
     }
 
-    private Optional<Class<?>> getTestClass(final TestSource source) {
-        if (source instanceof MethodSource) {
-            return getTestClass(((MethodSource) source).getClassName());
-        }
-        if (source instanceof ClassSource) {
-            return Optional.of(((ClassSource) source).getJavaClass());
-        }
-        return Optional.empty();
+    private Optional<String> getContainer(final TestIdentifier testIdentifier) {
+        return containers.get().get(testIdentifier);
     }
 
-    private Optional<Class<?>> getTestClass(final String className) {
-        try {
-            return Optional.of(Class.forName(className));
-        } catch (ClassNotFoundException e) {
-            LOGGER.trace("Could not get test class from test source {}", className, e);
-        }
-        return Optional.empty();
+    private String getOrCreateContainer(final TestIdentifier testIdentifier) {
+        return containers.get().getOrCreate(testIdentifier);
     }
 
-    private Optional<Method> getTestMethod(final TestSource source) {
-        if (source instanceof MethodSource) {
-            return getTestMethod((MethodSource) source);
-        }
-        return Optional.empty();
+    private Optional<String> getTest(final TestIdentifier testIdentifier) {
+        return tests.get().get(testIdentifier);
     }
 
-    private Optional<Method> getTestMethod(final MethodSource source) {
-        try {
-            final Class<?> aClass = Class.forName(source.getClassName());
-            return Stream.of(aClass.getDeclaredMethods())
-                    .filter(method -> MethodSource.from(method).equals(source))
-                    .findAny();
-        } catch (ClassNotFoundException e) {
-            LOGGER.trace("Could not get test method from method source {}", source, e);
-        }
-        return Optional.empty();
+    private String getOrCreateTest(final TestIdentifier testIdentifier) {
+        return tests.get().getOrCreate(testIdentifier);
     }
 
-    private static class Uuids {
+    private static final class Uuids {
 
         private final Map<TestIdentifier, String> storage = new ConcurrentHashMap<>();
         private final ReadWriteLock lock = new ReentrantReadWriteLock();
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
new file mode 100644
index 000000000..14769ed22
--- /dev/null
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform;
+
+import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.ClasspathResourceSource;
+import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Method;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+/* package-private */ final class AllureJunitPlatformUtils {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatformUtils.class);
+    private static final String EMPTY = "";
+
+    private AllureJunitPlatformUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static Optional<String> getFullName(final TestSource source) {
+        if (source instanceof MethodSource) {
+            final MethodSource ms = (MethodSource) source;
+            return Optional.of(String.format("%s.%s", ms.getClassName(), ms.getMethodName()));
+        }
+        if (source instanceof ClassSource) {
+            final ClassSource cs = (ClassSource) source;
+            return Optional.ofNullable(cs.getClassName());
+        }
+        if (source instanceof ClasspathResourceSource) {
+            final ClasspathResourceSource crs = (ClasspathResourceSource) source;
+            final String s = crs.getPosition()
+                    .map(filePosition -> ":" + filePosition.getLine())
+                    .orElse(EMPTY);
+            return Optional.of(crs.getClasspathResourceName() + s);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Class<?>> getTestClass(final TestSource source) {
+        if (source instanceof MethodSource) {
+            return getTestClass(((MethodSource) source).getClassName());
+        }
+        if (source instanceof ClassSource) {
+            return Optional.of(((ClassSource) source).getJavaClass());
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Class<?>> getTestClass(final String className) {
+        try {
+            return Optional.of(Class.forName(className));
+        } catch (ClassNotFoundException e) {
+            LOGGER.trace("Could not get test class from test source {}", className, e);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Method> getTestMethod(final TestSource source) {
+        if (source instanceof MethodSource) {
+            return getTestMethod((MethodSource) source);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Method> getTestMethod(final MethodSource source) {
+        try {
+            final Class<?> aClass = Class.forName(source.getClassName());
+            return Stream.of(aClass.getDeclaredMethods())
+                    .filter(method -> MethodSource.from(method).equals(source))
+                    .findAny();
+        } catch (ClassNotFoundException e) {
+            LOGGER.trace("Could not get test method from method source {}", source, e);
+        }
+        return Optional.empty();
+    }
+}
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
new file mode 100644
index 000000000..56525bd02
--- /dev/null
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
@@ -0,0 +1,128 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform;
+
+import io.qameta.allure.model.Label;
+import io.qameta.allure.testfilter.FileTestPlanSupplier;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import io.qameta.allure.util.AnnotationUtils;
+import org.junit.platform.engine.FilterResult;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestTag;
+import org.junit.platform.launcher.PostDiscoveryFilter;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllurePostDiscoveryFilter implements PostDiscoveryFilter {
+
+    private static final Pattern ID_TAG = Pattern.compile("^@?allure\\.id[:=](?<id>.+)$");
+
+    private final TestPlan testPlan;
+
+    public AllurePostDiscoveryFilter() {
+        this(new FileTestPlanSupplier().supply().orElse(null));
+    }
+
+    public AllurePostDiscoveryFilter(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+    }
+
+    @Override
+    public FilterResult apply(final TestDescriptor object) {
+        if (Objects.isNull(testPlan)) {
+            return FilterResult.included("test plan is empty");
+        }
+        if (!object.getChildren().isEmpty()) {
+            return FilterResult.included("filter only applied for tests");
+        }
+
+        final String allureId = findAllureId(object);
+        final String uniqueId = object.getUniqueId().toString();
+        final String fullName = object.getSource()
+                .flatMap(AllureJunitPlatformUtils::getFullName)
+                .orElse(null);
+
+        return FilterResult.includedIf(
+                isIncluded(testPlan, allureId, uniqueId, fullName)
+        );
+    }
+
+    private boolean isIncluded(final TestPlan testPlan,
+                               final String allureId,
+                               final String uniqueId,
+                               final String fullName) {
+        if (testPlan instanceof TestPlanV1_0) {
+            final TestPlanV1_0 tp = (TestPlanV1_0) testPlan;
+            return Objects.isNull(tp.getTests()) || tp.getTests()
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .anyMatch(tc -> match(tc, allureId, uniqueId, fullName));
+        }
+        return true;
+    }
+
+    @SuppressWarnings("BooleanExpressionComplexity")
+    private boolean match(final TestPlanV1_0.TestCase tc,
+                          final String allureId,
+                          final String uniqueId,
+                          final String fullName) {
+        return Objects.nonNull(tc.getId()) && tc.getId().equals(allureId)
+                || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(uniqueId)
+                || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(fullName);
+    }
+
+    private String findAllureId(final TestDescriptor object) {
+        return object.getSource()
+                .flatMap(AllureJunitPlatformUtils::getTestMethod)
+                .flatMap(this::findAllureId)
+                .orElseGet(() -> findAllureId(object.getTags()));
+    }
+
+    private String findAllureId(final Collection<TestTag> tags) {
+        return tags.stream()
+                .map(TestTag::getName)
+                .map(t -> {
+                    final Matcher matcher = ID_TAG.matcher(t);
+                    return matcher.matches()
+                            ? Optional.ofNullable(matcher.group("id"))
+                            : Optional.<String>empty();
+                })
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findAny()
+                .orElse(null);
+    }
+
+    private Optional<String> findAllureId(final Method value) {
+        return AnnotationUtils.getLabels(value)
+                .stream()
+                .filter(l -> ALLURE_ID_LABEL_NAME.equals(l.getName()))
+                .map(Label::getValue)
+                .findAny();
+    }
+
+}
diff --git a/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml b/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
     </aspects>
-</aspectj>
\ No newline at end of file
+</aspectj>
diff --git a/allure-junit-platform/src/main/services/org.junit.platform.launcher.PostDiscoveryFilter b/allure-junit-platform/src/main/services/org.junit.platform.launcher.PostDiscoveryFilter
new file mode 100644
index 000000000..94f98f34e
--- /dev/null
+++ b/allure-junit-platform/src/main/services/org.junit.platform.launcher.PostDiscoveryFilter
@@ -0,0 +1 @@
+io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
\ No newline at end of file
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index f81c299e0..9e9c1b82a 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,12 +16,7 @@
 package io.qameta.allure.junitplatform;
 
 import io.github.glytching.junit.extension.system.SystemProperty;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
-import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.junitplatform.features.AllureIdAnnotationSupport;
 import io.qameta.allure.junitplatform.features.BrokenInAfterAllTests;
 import io.qameta.allure.junitplatform.features.BrokenInBeforeAllTests;
@@ -31,13 +26,17 @@
 import io.qameta.allure.junitplatform.features.DisabledTests;
 import io.qameta.allure.junitplatform.features.DynamicTests;
 import io.qameta.allure.junitplatform.features.FailedTests;
+import io.qameta.allure.junitplatform.features.JupiterUniqueIdTest;
 import io.qameta.allure.junitplatform.features.MarkerAnnotationSupport;
+import io.qameta.allure.junitplatform.features.NestedTests;
 import io.qameta.allure.junitplatform.features.OneTest;
 import io.qameta.allure.junitplatform.features.OwnerTest;
 import io.qameta.allure.junitplatform.features.ParallelTests;
 import io.qameta.allure.junitplatform.features.ParameterisedTests;
+import io.qameta.allure.junitplatform.features.ParameterisedTestsWithDisplayName;
 import io.qameta.allure.junitplatform.features.PassedTests;
 import io.qameta.allure.junitplatform.features.RepeatedTests;
+import io.qameta.allure.junitplatform.features.ReportEntryParameter;
 import io.qameta.allure.junitplatform.features.SeverityTest;
 import io.qameta.allure.junitplatform.features.SkippedInBeforeAllTests;
 import io.qameta.allure.junitplatform.features.SkippedTests;
@@ -57,6 +56,7 @@
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Stage;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
@@ -64,11 +64,10 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceLock;
-import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
@@ -82,8 +81,9 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.JUNIT_PLATFORM_UNIQUE_ID;
+import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.runClasses;
 import static io.qameta.allure.junitplatform.features.TaggedTests.CLASS_TAG;
 import static io.qameta.allure.junitplatform.features.TaggedTests.METHOD_TAG;
 import static io.qameta.allure.test.AllurePredicates.hasLabel;
@@ -220,9 +220,9 @@ void shouldProcessBrokenInAfterAllTests() {
                         tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
                 .containsExactlyInAnyOrder(
                         tuple("BrokenInAfterAllTests", Status.BROKEN, "Exception in @AfterAll"),
-                        tuple("[1] a", Status.PASSED, null),
-                        tuple("[2] b", Status.PASSED, null),
-                        tuple("[3] c", Status.PASSED, null),
+                        tuple("parameterisedTest(String) [1] value=a", Status.PASSED, null),
+                        tuple("parameterisedTest(String) [2] value=b", Status.PASSED, null),
+                        tuple("parameterisedTest(String) [3] value=c", Status.PASSED, null),
                         tuple("test1()", Status.PASSED, null),
                         tuple("test2()", Status.PASSED, null)
                 );
@@ -334,7 +334,10 @@ void shouldProcessParametrisedTests() {
                 .hasSize(2)
                 .filteredOn(hasStatus(Status.PASSED))
                 .flatExtracting(TestResult::getName)
-                .containsExactlyInAnyOrder("[1] Hello", "[2] World");
+                .containsExactlyInAnyOrder(
+                        "testWithStringParameter(String) [1] argument=Hello",
+                        "testWithStringParameter(String) [2] argument=World"
+                );
     }
 
     @Test
@@ -772,36 +775,153 @@ void shouldSupportAllureIdAnnotations() {
 
     }
 
-    @Step("Run classes {classes}")
-    private AllureResults runClasses(final Class<?>... classes) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
+    @AllureFeatures.Base
+    @Test
+    void shouldPopulateTestCaseId() {
+        final AllureResults results = runClasses(JupiterUniqueIdTest.class);
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .filteredOn("name", JUNIT_PLATFORM_UNIQUE_ID)
+                .extracting(Label::getValue)
+                .first()
+                .isEqualTo("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.JupiterUniqueIdTest]/[method:jupiterTest()]");
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldAllowUsageOfDisplayForParameterisedTests() {
+        final AllureResults results = runClasses(ParameterisedTestsWithDisplayName.class);
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(
+                        TestResult::getName
+                )
+                .containsExactlyInAnyOrder(
+                        "Second Test [1] value=a",
+                        "Second Test [2] value=b"
+                );
+    }
 
-        final ClassSelector[] classSelectors = Stream.of(classes)
-                .map(DiscoverySelectors::selectClass)
-                .toArray(ClassSelector[]::new);
+    @AllureFeatures.Parameters
+    @Test
+    void shouldProcessAllureParameterReportingEvents() {
+        final AllureResults results = runClasses(ReportEntryParameter.class);
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .filteredOn("name", "simpleParameterEvent(TestReporter)")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .containsExactlyInAnyOrder(
+                        tuple("some parameter name", "some parameter value", null, null)
+                );
+        assertThat(testResults)
+                .filteredOn("name", "multipleParameterEvent(TestReporter)")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .containsExactlyInAnyOrder(
+                        tuple("first name", "first value", null, null),
+                        tuple("second name", "second value", null, null),
+                        tuple("third name", "third value", null, null)
+                );
+        assertThat(testResults)
+                .filteredOn("name", "modeAndExcluded(TestReporter)")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .containsExactlyInAnyOrder(
+                        tuple("hidden excluded", "hidden excluded value", Parameter.Mode.HIDDEN, true),
+                        tuple("default excluded", "default excluded value", Parameter.Mode.DEFAULT, true),
+                        tuple("masked not excluded", "masked not excluded value", Parameter.Mode.MASKED, false)
+                );
+    }
 
-        final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .selectors(classSelectors)
-                .build();
+    @Test
+    @AllureFeatures.Retries
+    void shouldSetDifferentUuidsInDifferentRuns() {
+        final AllureResults results = RunUtils.runTests(lifecycle -> {
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .filters(new AllurePostDiscoveryFilter(null))
+                    .selectors(DiscoverySelectors.selectClass(OneTest.class))
+                    .build();
 
-        final LauncherConfig config = LauncherConfig.builder()
-                .enableTestExecutionListenerAutoRegistration(false)
-                .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
-                .build();
-        final Launcher launcher = LauncherFactory.create(config);
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .enablePostDiscoveryFilterAutoRegistration(false)
+                    .build();
+            final Launcher launcher = LauncherFactory.create(config);
 
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+            // execute request twice
             launcher.execute(request);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+            launcher.execute(request);
+        });
+
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(2);
+
+        final TestResult tr1 = testResults.get(0);
+        final TestResult tr2 = testResults.get(1);
+
+        assertThat(tr1)
+                .extracting(TestResult::getUuid)
+                .isNotEqualTo(tr2.getUuid());
+
+        assertThat(tr1)
+                .extracting(TestResult::getHistoryId)
+                .isEqualTo(tr2.getHistoryId());
+
+    }
+
+    @Test
+    void shouldSupportNestedClasses() {
+        final AllureResults allureResults = runClasses(NestedTests.class);
+
+        assertThat(allureResults.getTestResults())
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder(
+                        "parentTest()",
+                        "feature1Test()",
+                        "feature2Test()",
+                        "story1Test()"
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "parentTest()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Parent feature")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "feature1Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 1")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "feature2Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 2")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "story1Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 2"),
+                        tuple("story", "Story 1")
+                );
     }
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
new file mode 100644
index 000000000..9cd8a8f60
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
@@ -0,0 +1,68 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform;
+
+import io.qameta.allure.Step;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import io.qameta.allure.testfilter.TestPlan;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.LauncherConfig;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class AllureJunitPlatformTestUtils {
+
+    private AllureJunitPlatformTestUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    @Step("Run classes {classes}")
+    public static AllureResults runClasses(final Class<?>... classes) {
+        return runClasses(null, classes);
+    }
+
+    @Step("Run classes {classes}")
+    public static AllureResults runClasses(final TestPlan testPlan, final Class<?>... classes) {
+        return RunUtils.runTests(lifecycle -> {
+            final ClassSelector[] classSelectors = Stream.of(classes)
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
+
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .filters(new AllurePostDiscoveryFilter(testPlan))
+                    .selectors(classSelectors)
+                    .build();
+
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .enablePostDiscoveryFilterAutoRegistration(false)
+                    .build();
+            final Launcher launcher = LauncherFactory.create(config);
+            launcher.execute(request);
+        });
+    }
+
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
new file mode 100644
index 000000000..eb13add0b
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
@@ -0,0 +1,146 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform;
+
+import io.qameta.allure.junitplatform.features.FilterParameterizedTests;
+import io.qameta.allure.junitplatform.features.FilterSimpleTests;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.runClasses;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllurePostDiscoveryFilterTest {
+
+    @Test
+    void shouldRunAllTestsIfNoTestPlanProvided() {
+        final AllureResults results = runClasses(FilterSimpleTests.class);
+
+        assertThat(results.getTestResults())
+                .hasSize(3);
+    }
+
+    @Test
+    void shouldRunAllParameterizedTestsIfNoTestPlanProvided() {
+        final AllureResults results = runClasses(FilterParameterizedTests.class);
+
+        assertThat(results.getTestResults())
+                .hasSize(6);
+    }
+
+    @Test
+    void shouldRunAllTestsIfEmptyTestPlanProvided() {
+        final AllureResults results = runClasses(new TestPlanV1_0(), FilterSimpleTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(3);
+    }
+
+    @Test
+    void shouldRunAllParameterizedTestsIfEmptyTestPlanProvided() {
+        final AllureResults results = runClasses(new TestPlanV1_0(), FilterParameterizedTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(6);
+    }
+
+    @Test
+    void shouldFilterTestCasesByFullName() {
+        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
+                new TestPlanV1_0.TestCase()
+                        .setSelector(String.format("%s.second", FilterSimpleTests.class.getCanonicalName())),
+                new TestPlanV1_0.TestCase()
+                        .setSelector(String.format("%s.first", FilterSimpleTests.class.getCanonicalName())))
+        );
+
+        final AllureResults results = runClasses(testPlan, FilterSimpleTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(2);
+    }
+
+    @Test
+    void shouldFilterParameterizedTestCasesByFullName() {
+        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
+                new TestPlanV1_0.TestCase()
+                        .setSelector(String.format("%s.second", FilterParameterizedTests.class.getCanonicalName())),
+                new TestPlanV1_0.TestCase()
+                        .setSelector(String.format("%s.first", FilterParameterizedTests.class.getCanonicalName()))
+        ));
+
+        final AllureResults results = runClasses(testPlan, FilterParameterizedTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(4);
+    }
+
+    @Test
+    void shouldFilterTestCasesByUniqueId() {
+        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
+                new TestPlanV1_0.TestCase()
+                        .setSelector(testId(FilterSimpleTests.class, "first")),
+                new TestPlanV1_0.TestCase()
+                        .setSelector(testId(FilterSimpleTests.class, "third"))
+        ));
+
+        final AllureResults results = runClasses(testPlan, FilterSimpleTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(2);
+    }
+
+    @Test
+    void shouldFilterTestCasesByAllureId() {
+        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
+                new TestPlanV1_0.TestCase()
+                        .setId("10"),
+                new TestPlanV1_0.TestCase()
+                        .setId("20"),
+                new TestPlanV1_0.TestCase()
+                        .setId("30")
+        ));
+
+        final AllureResults results = runClasses(testPlan, FilterSimpleTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(2);
+    }
+
+    @Test
+    void shouldFilterParameterizedTestCasesByAllureId() {
+        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
+                new TestPlanV1_0.TestCase()
+                        .setId("10"),
+                new TestPlanV1_0.TestCase()
+                        .setId("20")
+        ));
+
+        final AllureResults results = runClasses(testPlan, FilterParameterizedTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(4);
+    }
+
+
+    private String testId(final Class<?> testClass, String method) {
+        return String.format("[engine:%s]/[class:%s]/[method:%s()]",
+                "junit-jupiter",
+                testClass.getCanonicalName(),
+                method);
+    }
+
+
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
index 2db9bcdf2..5fce824ad 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
index 32a766fe8..2fb9f401b 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
index c9ba4f15e..f91459bad 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
index e286688b3..a69c7c4f9 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
index 6a769becf..d4fa32846 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
index 88da3190b..f3e8101f7 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
index b6794dbe8..48cfcef98 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
index 77b7be46f..a3940fa20 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
index 74debbb95..1a8a1d779 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
index 6c7a79df0..91be711a6 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
new file mode 100644
index 000000000..44867edd0
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.AllureId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class FilterParameterizedTests {
+
+    @BeforeAll
+    static void doNothing() {
+
+    }
+
+    @AllureId("10")
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void first(String value) {
+    }
+
+    @AllureId("20")
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void second(String value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void third(String value) {
+    }
+
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
new file mode 100644
index 000000000..dad7fcb45
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.AllureId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class FilterSimpleTests {
+
+    @BeforeAll
+    static void doNothing(){
+
+    }
+
+    @Test
+    @AllureId("10")
+    void first() {
+    }
+
+    @Test
+    @AllureId("20")
+    void second() {
+    }
+
+    @Test
+    void third() {
+    }
+
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
new file mode 100644
index 000000000..d3f33cafc
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
@@ -0,0 +1,28 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author naresha (Naresha K)
+ */
+public class JupiterUniqueIdTest {
+
+    @Test
+    void jupiterTest() {
+    }
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
index f2ee83da6..b8c91afbe 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
new file mode 100644
index 000000000..55069931f
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
@@ -0,0 +1,62 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.Epic;
+import io.qameta.allure.Feature;
+import io.qameta.allure.Story;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@Epic("Parent epic")
+public class NestedTests {
+
+    @Feature("Parent feature")
+    @Test
+    void parentTest() {
+    }
+
+    @Feature("Feature 1")
+    @Nested
+    class Feature1 {
+
+        @Test
+        void feature1Test() {
+        }
+    }
+
+    @Feature("Feature 2")
+    @Nested
+    class Feature2 {
+
+        @Test
+        void feature2Test() {
+        }
+
+        @Story("Story 1")
+        @Nested
+        class Story1 {
+
+            @Test
+            void story1Test() {
+            }
+
+        }
+    }
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
index 6b64f3932..9a9ea4136 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
index e1933ab01..f59e95fad 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
index e580f5077..06dbe11f4 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
index 19457b4ab..ee0606cd1 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
new file mode 100644
index 000000000..e3677440a
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedTestsWithDisplayName {
+
+    @DisplayName("Second Test")
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void first(String value) {
+    }
+
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
index 7a38a1fd3..4b6cb9f62 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
index 02797b0b8..a63a81cca 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
new file mode 100644
index 000000000..de199041f
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
@@ -0,0 +1,93 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.model.Parameter;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestReporter;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_EXCLUDED_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_MODE_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_VALUE_KEY;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ReportEntryParameter {
+
+    @Test
+    void simpleParameterEvent(TestReporter testReporter) {
+        testReporter.publishEntry(buildEvent("some parameter name", "some parameter value"));
+    }
+
+    @Test
+    void multipleParameterEvent(TestReporter testReporter) {
+        testReporter.publishEntry(buildEvent("first name", "first value"));
+        testReporter.publishEntry(buildEvent("second name", "second value"));
+        testReporter.publishEntry(buildEvent("third name", "third value"));
+    }
+
+    @Test
+    void modeAndExcluded(TestReporter testReporter) {
+        testReporter.publishEntry(buildEvent(
+                "hidden excluded",
+                "hidden excluded value",
+                Parameter.Mode.HIDDEN,
+                true
+        ));
+        testReporter.publishEntry(buildEvent(
+                "default excluded",
+                "default excluded value",
+                Parameter.Mode.DEFAULT,
+                true
+        ));
+        testReporter.publishEntry(buildEvent(
+                "masked not excluded",
+                "masked not excluded value",
+                Parameter.Mode.MASKED,
+                false
+        ));
+    }
+
+    private Map<String, String> buildEvent(final String name,
+                                           final String value) {
+        return buildEvent(name, value, null, null);
+    }
+
+    private Map<String, String> buildEvent(final String name,
+                                           final String value,
+                                           final Parameter.Mode mode,
+                                           final Boolean excluded) {
+        final Map<String, String> data = new HashMap<>();
+        data.put(ALLURE_PARAMETER, name);
+        data.put(ALLURE_PARAMETER_VALUE_KEY, value);
+        if (Objects.nonNull(mode)) {
+            data.put(ALLURE_PARAMETER_MODE_KEY, mode.name());
+        }
+        if (Objects.nonNull(excluded)) {
+            data.put(ALLURE_PARAMETER_EXCLUDED_KEY, excluded.toString());
+        }
+
+        return data;
+    }
+
+
+}
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
index af0062a66..055a34537 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
index ca6cc60c1..51e856360 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
index b0f227314..17bfcafff 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
index 8b287509f..8f544d85b 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
index e12bdec81..bba2c9e0e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
index b9ddc449a..8dcf86e56 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
index f018a3973..1119c59dc 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
index f4d1867a1..d2ee4ed9f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
index 9ae2ab1f5..39701deca 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
index 688931756..09d45396c 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
index 480f345fd..77f6d1409 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
index 16ec35209..a1f8b6706 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
index 020c1dfd2..7310b02bb 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
index b677ac22f..1e3762d4b 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
index a63d21cf4..ee2c4a38a 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
index 84552795b..e66f077ff 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
new file mode 100644
index 000000000..2f013ff0d
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.AllureId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class TestsWithAllureId {
+
+    @BeforeAll
+    static void doNothing(){
+
+    }
+
+    @Test
+    void first() {
+    }
+
+    @AllureId("32")
+    @Test
+    void second() {
+    }
+
+    @AllureId("48")
+    @Test
+    void third() {
+    }
+
+    @Tag("allure.id=34")
+    @Test
+    void oneMoreTest() {
+    }
+
+}
diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts
index 95d007017..79d3bc537 100644
--- a/allure-junit4-aspect/build.gradle.kts
+++ b/allure-junit4-aspect/build.gradle.kts
@@ -1,14 +1,11 @@
 description = "Allure JUnit 4 Aspect HACK"
 
-val agent: Configuration by configurations.creating
-
-val junitVersion = "4.12"
+val junitVersion = "4.13.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit4"))
-    implementation("junit:junit:$junitVersion")
-    implementation("org.aspectj:aspectjrt")
+    compileOnly("junit:junit:$junitVersion")
+    compileOnly("org.aspectj:aspectjrt")
 }
 
 tasks.jar {
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
new file mode 100644
index 000000000..348f7c971
--- /dev/null
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.aspect;
+
+import io.qameta.allure.junit4.AllureJunit4Filter;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Filterable;
+import org.junit.runner.manipulation.NoTestsRemainException;
+
+/**
+ * @author Egor Borisov ehborisov@gmail.com
+ */
+@Aspect
+public class AllureJunit4FilterAspect {
+
+    @AfterReturning(
+            value = "execution(public org.junit.runner.Runner org.junit.runner.Request+.getRunner())",
+            returning = "runner"
+    )
+    public void filterBeforeRun(final Runner runner) {
+        if (runner instanceof Filterable) {
+            try {
+                ((Filterable) runner).filter(new AllureJunit4Filter());
+            } catch (NoTestsRemainException ignored) {
+                //do nothing
+            }
+        }
+    }
+
+}
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
index b1d52f2f5..bd351e30e 100644
--- a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@ public class AllureJunit4ListenerAspect {
     @After("execution(org.junit.runner.notification.RunNotifier.new())")
     public void addListener(final JoinPoint point) {
         final RunNotifier notifier = (RunNotifier) point.getThis();
-        notifier.removeListener(allure);
-        notifier.addListener(allure);
+        if (RunNotifier.class.equals(notifier.getClass())) {
+            notifier.addListener(allure);
+        }
     }
-
 }
diff --git a/allure-junit4-aspect/src/main/resources/META-INF/aop.xml b/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
index fa1632bca..d17b2a93b 100644
--- a/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
+++ b/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
@@ -1,5 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.junit4.aspect.AllureJunit4ListenerAspect"/>
+        <aspect name="io.qameta.allure.junit4.aspect.AllureJunit4FilterAspect"/>
     </aspects>
 </aspectj>
diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
index fd9bcfd10..065302c88 100644
--- a/allure-junit4/build.gradle.kts
+++ b/allure-junit4/build.gradle.kts
@@ -1,13 +1,13 @@
 description = "Allure JUnit 4 Integration"
 
-val agent: Configuration by configurations.creating
-
-val junitVersion = "4.12"
+val junitVersion = "4.13.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("junit:junit:$junitVersion")
+    compileOnly("junit:junit:$junitVersion")
+    implementation(project(":allure-test-filter"))
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("junit:junit:$junitVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
@@ -28,7 +28,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*", "SampleTestInDefaultPackage.java")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 3b312bb1b..e2eee4396 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,12 +29,15 @@
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.util.AnnotationUtils.getLabels;
 import static io.qameta.allure.util.AnnotationUtils.getLinks;
@@ -46,6 +49,7 @@
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.getJavadocDescription;
 import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
@@ -55,9 +59,21 @@
  * Allure Junit4 listener.
  */
 @RunListener.ThreadSafe
-@SuppressWarnings({"PMD.ExcessiveImports", "PMD.CouplingBetweenObjects", "checkstyle:ClassFanOutComplexity"})
+@SuppressWarnings({"checkstyle:ClassFanOutComplexity"})
 public class AllureJunit4 extends RunListener {
 
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+
     private final ThreadLocal<String> testCases = new InheritableThreadLocal<String>() {
         @Override
         protected String initialValue() {
@@ -91,6 +107,9 @@ public void testRunFinished(final Result result) {
 
     @Override
     public void testStarted(final Description description) {
+        if (shouldIgnore(description)) {
+            return;
+        }
         final String uuid = testCases.get();
         final TestResult result = createTestResult(uuid, description);
         getLifecycle().scheduleTestCase(result);
@@ -99,6 +118,9 @@ public void testStarted(final Description description) {
 
     @Override
     public void testFinished(final Description description) {
+        if (shouldIgnore(description)) {
+            return;
+        }
         final String uuid = testCases.get();
         testCases.remove();
         getLifecycle().updateTestCase(uuid, testResult -> {
@@ -113,6 +135,9 @@ public void testFinished(final Description description) {
 
     @Override
     public void testFailure(final Failure failure) {
+        if (shouldIgnore(failure.getDescription())) {
+            return;
+        }
         final String uuid = testCases.get();
         getLifecycle().updateTestCase(uuid, testResult -> testResult
                 .setStatus(getStatus(failure.getException()).orElse(null))
@@ -122,6 +147,9 @@ public void testFailure(final Failure failure) {
 
     @Override
     public void testAssumptionFailure(final Failure failure) {
+        if (shouldIgnore(failure.getDescription())) {
+            return;
+        }
         final String uuid = testCases.get();
         getLifecycle().updateTestCase(uuid, testResult ->
                 testResult.setStatus(Status.SKIPPED)
@@ -131,6 +159,9 @@ public void testAssumptionFailure(final Failure failure) {
 
     @Override
     public void testIgnored(final Description description) {
+        if (shouldIgnore(description)) {
+            return;
+        }
         final String uuid = testCases.get();
         testCases.remove();
 
@@ -150,8 +181,38 @@ private Optional<String> getDisplayName(final Description result) {
     }
 
     private Optional<String> getDescription(final Description result) {
-        return Optional.ofNullable(result.getAnnotation(io.qameta.allure.Description.class))
-                .map(io.qameta.allure.Description::value);
+        final io.qameta.allure.Description annotation = result
+                .getAnnotation(io.qameta.allure.Description.class);
+
+        if (Objects.isNull(annotation)) {
+            return Optional.empty();
+        }
+
+        if (!"".equals(annotation.value())) {
+            return Optional.of(annotation.value());
+        }
+
+        // since we have no access to method & method parameter types
+        // we simply find all the methods within test class that matching
+        // specified method name. If there is only one result, consider it a
+        // test.
+        final Class<?> testClass = result.getTestClass();
+        final String methodName = result.getMethodName();
+        if (Objects.nonNull(testClass) && Objects.nonNull(methodName)) {
+            final List<Method> found = Stream.of(testClass.getMethods())
+                    .filter(method -> Objects.equals(methodName, method.getName()))
+                    .collect(Collectors.toList());
+            if (found.size() != 1) {
+                return Optional.empty();
+            }
+
+            final Method method = found.get(0);
+            return getJavadocDescription(
+                    method.getDeclaringClass().getClassLoader(),
+                    method
+            );
+        }
+        return Optional.empty();
     }
 
     private List<Link> extractLinks(final Description description) {
@@ -194,7 +255,7 @@ private TestResult createTestResult(final String uuid, final Description descrip
         final String className = description.getClassName();
         final String methodName = description.getMethodName();
         final String name = Objects.nonNull(methodName) ? methodName : className;
-        final String fullName = Objects.nonNull(methodName) ? String.format("%s.%s", className, methodName) : className;
+        final String fullName = AllureJunit4Utils.getFullName(description);
         final String suite = Optional.ofNullable(description.getTestClass())
                 .map(it -> it.getAnnotation(DisplayName.class))
                 .map(DisplayName::value).orElse(className);
@@ -220,8 +281,26 @@ private TestResult createTestResult(final String uuid, final Description descrip
         testResult.getLinks().addAll(extractLinks(description));
 
         getDisplayName(description).ifPresent(testResult::setName);
+
         getDescription(description).ifPresent(testResult::setDescription);
         return testResult;
     }
 
+    @SuppressWarnings({"CyclomaticComplexity", "BooleanExpressionComplexity"})
+    private boolean shouldIgnore(final Description description) {
+        return (HAS_CUCUMBERJVM7_IN_CLASSPATH
+                || HAS_CUCUMBERJVM6_IN_CLASSPATH
+                || HAS_CUCUMBERJVM5_IN_CLASSPATH
+                || HAS_CUCUMBERJVM4_IN_CLASSPATH
+               ) && AllureJunit4Utils.isCucumberTest(description);
+    }
+
+    private static boolean isClassAvailableOnClasspath(final String clazz) {
+        try {
+            AllureJunit4.class.getClassLoader().loadClass(clazz);
+            return true;
+        } catch (Exception ignored) {
+            return false;
+        }
+    }
 }
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
new file mode 100644
index 000000000..f856bf269
--- /dev/null
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
@@ -0,0 +1,95 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4;
+
+import io.qameta.allure.model.Label;
+import io.qameta.allure.testfilter.FileTestPlanSupplier;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import io.qameta.allure.util.AnnotationUtils;
+import org.junit.runner.Description;
+import org.junit.runner.manipulation.Filter;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllureJunit4Filter extends Filter {
+
+    private final TestPlan testPlan;
+
+    public AllureJunit4Filter() {
+        this(new FileTestPlanSupplier().supply().orElse(null));
+    }
+
+    public AllureJunit4Filter(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+    }
+
+    @Override
+    public boolean shouldRun(final Description description) {
+        if (Objects.isNull(testPlan)) {
+            return true;
+        }
+
+        if (description.isSuite()) {
+            return true;
+        }
+
+        final String fullName = AllureJunit4Utils.getFullName(description);
+        final String allureId = findAllureId(description).orElse(null);
+
+        return isIncluded(testPlan, allureId, fullName);
+    }
+
+    @Override
+    public String describe() {
+        return "allure testplan filter";
+    }
+
+    private boolean isIncluded(final TestPlan testPlan,
+                               final String allureId,
+                               final String fullName) {
+        if (testPlan instanceof TestPlanV1_0) {
+            final TestPlanV1_0 tp = (TestPlanV1_0) testPlan;
+            return Objects.isNull(tp.getTests()) || tp.getTests()
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .anyMatch(tc -> match(tc, allureId, fullName));
+        }
+        return true;
+    }
+
+    @SuppressWarnings("BooleanExpressionComplexity")
+    private boolean match(final TestPlanV1_0.TestCase tc,
+                          final String allureId,
+                          final String fullName) {
+        return Objects.nonNull(tc.getId()) && tc.getId().equals(allureId)
+               || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(fullName);
+    }
+
+    private static Optional<String> findAllureId(final Description description) {
+        return AnnotationUtils.getLabels(description.getAnnotations())
+                .stream()
+                .filter(l -> ALLURE_ID_LABEL_NAME.equals(l.getName()))
+                .map(Label::getValue)
+                .findAny();
+    }
+}
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
new file mode 100644
index 000000000..24fa2a8a2
--- /dev/null
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
@@ -0,0 +1,112 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4;
+
+import org.junit.runner.Description;
+
+import java.io.Serializable;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+/* package-private */ final class AllureJunit4Utils {
+
+    private static final Description CUCUMBER_CHECK_DESCRIPTION = Description
+            .createSuiteDescription("check", new CucumberCheck());
+
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().toString();
+    private static final String CLASSPATH_PREFIX = "classpath:";
+    private static final String FILE_PREFIX = "file:";
+
+    private AllureJunit4Utils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static String getFullName(final Description description) {
+        final Class<?> testClass = description.getTestClass();
+        if (Objects.isNull(testClass)) {
+            final UniqueIdExtract uniqueId = new UniqueIdExtract();
+            //noinspection ResultOfMethodCallIgnored
+            Description.createSuiteDescription("extract", uniqueId)
+                    .equals(description);
+            final String testCaseUri = uniqueId.id;
+            if (Objects.nonNull(testCaseUri)) {
+                if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+                    return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+                }
+                if (testCaseUri.startsWith(CLASSPATH_PREFIX)) {
+                    return testCaseUri.substring(CLASSPATH_PREFIX.length());
+                }
+                if (testCaseUri.startsWith(FILE_PREFIX)) {
+                    return testCaseUri.substring(FILE_PREFIX.length());
+                }
+                return testCaseUri;
+            }
+        }
+
+        final String className = description.getClassName();
+        final String methodName = description.getMethodName();
+        return Objects.nonNull(methodName)
+                ? String.format("%s.%s", className, methodName) : className;
+    }
+
+    public static boolean isCucumberTest(final Description description) {
+        return CUCUMBER_CHECK_DESCRIPTION.equals(description);
+    }
+
+    /**
+     * This is the Dummy class to check is {@link Description} object created
+     * by Cucumber runner. We are using the fact that Cucumber runner creates
+     * Descriptions with uniqueId of type <code>io.cucumber.junit.PickleRunners.PickleId</code>.
+     */
+    static class CucumberCheck implements Serializable {
+
+        @Override
+        public boolean equals(final Object obj) {
+            return !Objects.isNull(obj) && "io.cucumber.junit.PickleRunners.PickleId"
+                    .equals(obj.getClass().getCanonicalName());
+        }
+
+        @Override
+        public int hashCode() {
+            return 1;
+        }
+    }
+
+    /**
+     * This is the Dummy class to extract <code>fUniqueId</code> field
+     * from {@link Description} object.
+     */
+    @SuppressWarnings("VisibilityModifier")
+    static class UniqueIdExtract implements Serializable {
+
+        String id;
+
+        @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
+        @Override
+        public boolean equals(final Object obj) {
+            id = Objects.toString(obj);
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            return 1;
+        }
+    }
+}
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
index 0b091f852..e72d01575 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
index b38023280..271dc7c5a 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
index a3646d454..112db3588 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,11 @@
  */
 package io.qameta.allure.junit4;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * @author jkttt on 05.07.17.
diff --git a/allure-junit4/src/main/resources/META-INF/aop-ajc.xml b/allure-junit4/src/main/resources/META-INF/aop-ajc.xml
index 1f439cb73..09e38300c 100644
--- a/allure-junit4/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-junit4/src/main/resources/META-INF/aop-ajc.xml
@@ -1,4 +1,5 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
diff --git a/allure-junit4/src/test/java/SampleTestInDefaultPackage.java b/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
index a5b1dff0d..065c7d47a 100644
--- a/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
+++ b/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index 1ddf6ebae..99d08a644 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,15 +15,13 @@
  */
 package io.qameta.allure.junit4;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.junit4.samples.AssumptionFailedTest;
 import io.qameta.allure.junit4.samples.BrokenTest;
 import io.qameta.allure.junit4.samples.BrokenWithoutMessageTest;
+import io.qameta.allure.junit4.samples.DescriptionsJavadoc;
 import io.qameta.allure.junit4.samples.FailedTest;
+import io.qameta.allure.junit4.samples.FilterSimpleTests;
 import io.qameta.allure.junit4.samples.IgnoredClassTest;
 import io.qameta.allure.junit4.samples.IgnoredTests;
 import io.qameta.allure.junit4.samples.OneTest;
@@ -32,6 +30,7 @@
 import io.qameta.allure.junit4.samples.TestWithAnnotations;
 import io.qameta.allure.junit4.samples.TestWithSteps;
 import io.qameta.allure.junit4.samples.TestWithTimeout;
+import io.qameta.allure.junit4.samples.TheoriesTest;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Stage;
@@ -41,10 +40,14 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
 
+import java.util.Collections;
 import java.util.List;
 
 import static io.qameta.allure.junit4.samples.TaggedTests.CLASS_TAG1;
@@ -342,24 +345,88 @@ void shouldSupportTestsNotBasedOnClasses() {
                 );
     }
 
+    @Test
+    @AllureFeatures.FullName
+    void shouldFilterByFullName() {
+        final AllureResults results = runClasses(
+                new TestPlanV1_0()
+                        .setTests(Collections.singletonList(
+                                new TestPlanV1_0.TestCase()
+                                        .setSelector("io.qameta.allure.junit4.samples.OneTest.simpleTest")
+                        )),
+                OneTest.class, FailedTest.class,
+                TaggedTests.class, BrokenTest.class
+        );
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getFullName)
+                .containsExactly("io.qameta.allure.junit4.samples.OneTest.simpleTest");
+    }
+
+    @Test
+    @AllureFeatures.FullName
+    void shouldFilterByAllureId() {
+        final AllureResults results = runClasses(
+                new TestPlanV1_0()
+                        .setTests(Collections.singletonList(
+                                new TestPlanV1_0.TestCase()
+                                        .setId("771")
+                                        .setSelector("invalid")
+                        )),
+                OneTest.class, FailedTest.class,
+                TaggedTests.class, BrokenTest.class,
+                FilterSimpleTests.class
+        );
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getFullName)
+                .containsExactly("io.qameta.allure.junit4.samples.FilterSimpleTests.test3");
+    }
+
+    @Test
+    void shouldProcessJavadocDescriptions() {
+        final AllureResults results = runClasses(DescriptionsJavadoc.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        tuple("simpleTest", "Description from javadoc.")
+                );
+    }
+
+    @Test
+    void shouldProcessJavadocDescriptionsInTheories() {
+        final AllureResults results = runClasses(TheoriesTest.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        tuple("simpleTest", "Description from javadoc.")
+                );
+    }
+
     @Step("Run classes {classes}")
     private AllureResults runClasses(final Class<?>... classes) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
-        final JUnitCore core = new JUnitCore();
-        core.addListener(new AllureJunit4(lifecycle));
-
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
-            core.run(classes);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+        return runClasses(null, classes);
+    }
+
+    @Step("Run classes {classes}")
+    private AllureResults runClasses(final TestPlan testPlan, final Class<?>... classes) {
+        return RunUtils.runTests(lifecycle -> {
+            final JUnitCore core = new JUnitCore();
+            core.addListener(new AllureJunit4(lifecycle));
+
+            final Request request = Request
+                    .classes(classes)
+                    .filterWith(new AllureJunit4Filter(testPlan));
+
+            core.run(request);
+        });
     }
 }
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
index 66b3874bd..ed9b654f2 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
index 71510083c..a4a66c02a 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
index 85d15ee48..d622552ef 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
new file mode 100644
index 000000000..f7f0e97d1
--- /dev/null
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.samples;
+
+import io.qameta.allure.Description;
+import org.junit.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class DescriptionsJavadoc {
+
+    /**
+     * Description from javadoc.
+     */
+    @Description
+    @Test
+    public void simpleTest() {
+    }
+}
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
index 8d4fd2c35..9887d7f8c 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
new file mode 100644
index 000000000..31cec99f8
--- /dev/null
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
@@ -0,0 +1,38 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.samples;
+
+import io.qameta.allure.AllureId;
+import org.junit.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class FilterSimpleTests {
+
+    @Test
+    public void test1() {
+    }
+
+    @Test
+    public void test2() {
+    }
+
+    @AllureId("771")
+    @Test
+    public void test3() {
+    }
+}
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
index c17bceb5c..6702ec083 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
index 18599f91e..ff16dc0f7 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
index ed3e37ecd..3600cc143 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
index 7c2fc3911..a72c91bc8 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
index 64aa280ac..446dc661b 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
index 0f843bbdf..3eb78a05a 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
index f19e72e41..51f48e489 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
index 15133dfb8..53640d19a 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
new file mode 100644
index 000000000..e668da036
--- /dev/null
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.samples;
+
+import io.qameta.allure.Description;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@RunWith(Theories.class)
+public class TheoriesTest {
+
+    @DataPoints
+    public static final String[] VALUES = new String[]{
+            "first",
+            "second"
+    };
+
+    /**
+     * Description from javadoc.
+     */
+    @Description
+    @Theory
+    public void simpleTest(final String value) {
+        System.out.println(value);
+    }
+}
diff --git a/allure-junit5-assert/README.MD b/allure-junit5-assert/README.MD
new file mode 100644
index 000000000..5124d63c9
--- /dev/null
+++ b/allure-junit5-assert/README.MD
@@ -0,0 +1,21 @@
+Adding JUnit5-assert may lead to java.lang.OutOfMemoryError: Java heap space
+
+Having a huge class path may lead to OOM, because AspectJ processes all the classes. [Link to documentation](https://www.eclipse.org/aspectj/doc/released/devguide/ltw.html) 
+
+You can configure AspectJ to only process required classes
+* a) package io.qameta.allure -> to process Allure classes
+* b) package org.junit -> to process JUnit classes
+* c) package com.company -> to process your test classes
+
+Link to documentation https://www.eclipse.org/aspectj/doc/released/devguide/ltw-configuration.html#configuring-load-time-weaving-with-aopxml-files
+
+In order to avoid this issue add aop.xml into `resources/META-INF/` folder. 
+
+```<?xml version="1.0" encoding="utf-8"?>
+<aspectj>
+    <weaver>
+        <include within="io.qameta..*" />
+        <include within="org.junit..*" />
+        <include within="com.company..*" />
+    </weaver>
+</aspectj>```
diff --git a/allure-junit5-assert/build.gradle.kts b/allure-junit5-assert/build.gradle.kts
index d7584fa3c..dd5410151 100644
--- a/allure-junit5-assert/build.gradle.kts
+++ b/allure-junit5-assert/build.gradle.kts
@@ -1,14 +1,12 @@
 description = "Allure Junit5 Assertions Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit5"))
     compileOnly("org.aspectj:aspectjrt")
-    implementation("org.junit.jupiter:junit-jupiter-api")
+    compileOnly("org.junit.jupiter:junit-jupiter-api")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
@@ -24,8 +22,5 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
diff --git a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java b/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
index 669e59799..b483e0802 100644
--- a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
+++ b/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,7 +21,11 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.util.ObjectUtils;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java b/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
index 63d88429e..4848e2b90 100644
--- a/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
+++ b/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -233,4 +233,3 @@ void setLastName(String lastName) {
         }
     }
 }
-
diff --git a/allure-junit5/build.gradle.kts b/allure-junit5/build.gradle.kts
index 91499fd26..372885809 100644
--- a/allure-junit5/build.gradle.kts
+++ b/allure-junit5/build.gradle.kts
@@ -1,17 +1,15 @@
 description = "Allure JUnit 5 Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit-platform"))
-    implementation("org.junit.jupiter:junit-jupiter-api")
-    implementation("org.junit.platform:junit-platform-launcher")
+    compileOnly("org.junit.jupiter:junit-jupiter-api")
+    compileOnly("org.junit.platform:junit-platform-launcher")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.junit.platform:junit-platform-launcher")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
@@ -33,20 +31,18 @@ tasks.test {
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/features/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
-val spiOffJar by tasks.creating(Jar::class) {
+val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
     archiveClassifier.set("spi-off")
 }
 
-val spiOff by configurations.creating {
-    extendsFrom(configurations.getByName("compile"))
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
 }
 
-artifacts.add("archives", spiOffJar)
-artifacts.add("spiOff", spiOffJar)
-
diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index 501558459..8b785649f 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -1,19 +1,44 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package io.qameta.allure.junit5;
 
+import io.qameta.allure.Param;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.util.ObjectUtils;
 import io.qameta.allure.util.ResultsUtils;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_FIXTURE;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_EXCLUDED_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_MODE_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_VALUE_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_REPORT_ENTRY_BLANK_PREFIX;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_FAILURE;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_START;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_STOP;
@@ -26,6 +51,47 @@
 @SuppressWarnings("MultipleStringLiterals")
 public class AllureJunit5 implements InvocationInterceptor {
 
+    @Override
+    public void interceptTestTemplateMethod(final Invocation<Void> invocation,
+                                            final ReflectiveInvocationContext<Method> invocationContext,
+                                            final ExtensionContext extensionContext) throws Throwable {
+        sendParameterEvent(invocationContext, extensionContext);
+        invocation.proceed();
+    }
+
+    private void sendParameterEvent(final ReflectiveInvocationContext<Method> invocationContext,
+                                    final ExtensionContext extensionContext) {
+        final Parameter[] parameters = invocationContext.getExecutable().getParameters();
+        for (int i = 0; i < parameters.length; i++) {
+            final Parameter parameter = parameters[i];
+
+            final Class<?> parameterType = parameter.getType();
+            // Skip default jupiter injectables as TestInfo, TestReporter and TempDirectory
+            if (parameterType.getCanonicalName().startsWith("org.junit.jupiter.api")) {
+                continue;
+            }
+            final Object value = invocationContext.getArguments().get(i);
+            final Map<String, String> map = new HashMap<>();
+            map.put(ALLURE_PARAMETER, parameter.getName());
+            map.put(ALLURE_PARAMETER_VALUE_KEY, ObjectUtils.toString(value));
+
+            Stream.of(parameter.getAnnotationsByType(Param.class))
+                    .findFirst()
+                    .ifPresent(param -> {
+                        Stream.of(param.value(), param.name())
+                                .map(String::trim)
+                                .filter(name -> !name.isEmpty())
+                                .findFirst()
+                                .ifPresent(name -> map.put(ALLURE_PARAMETER, name));
+
+                        map.put(ALLURE_PARAMETER_MODE_KEY, param.mode().name());
+                        map.put(ALLURE_PARAMETER_EXCLUDED_KEY, Boolean.toString(param.excluded()));
+                    });
+
+            extensionContext.publishReportEntry(wrap(map));
+        }
+    }
+
     @Override
     public void interceptBeforeAllMethod(
             final Invocation<Void> invocation,
@@ -64,22 +130,22 @@ protected void processFixture(final String type,
                                   final ExtensionContext extensionContext) throws Throwable {
         final String uuid = UUID.randomUUID().toString();
         try {
-            extensionContext.publishReportEntry(buildStartEvent(
+            extensionContext.publishReportEntry(wrap(buildStartEvent(
                     type,
                     uuid,
                     invocationContext.getExecutable()
-            ));
+            )));
             invocation.proceed();
-            extensionContext.publishReportEntry(buildStopEvent(
+            extensionContext.publishReportEntry(wrap(buildStopEvent(
                     type,
                     uuid
-            ));
+            )));
         } catch (Throwable throwable) {
-            extensionContext.publishReportEntry(buildFailureEvent(
+            extensionContext.publishReportEntry(wrap(buildFailureEvent(
                     type,
                     uuid,
                     throwable
-            ));
+            )));
             throw throwable;
         }
     }
@@ -120,4 +186,18 @@ public Map<String, String> buildFailureEvent(final String type,
         maybeDetails.map(StatusDetails::getTrace).ifPresent(trace -> map.put("trace", trace));
         return map;
     }
+
+    @SuppressWarnings("PMD.InefficientEmptyStringCheck")
+    public Map<String, String> wrap(final Map<String, String> data) {
+        final Map<String, String> res = new HashMap<>();
+        data.forEach((key, value) -> {
+                    if (Objects.isNull(value) || value.trim().isEmpty()) {
+                        res.put(key, ALLURE_REPORT_ENTRY_BLANK_PREFIX + value);
+                    } else {
+                        res.put(key, value);
+                    }
+                }
+        );
+        return res;
+    }
 }
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index 3a2a488eb..19e62a917 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -1,23 +1,41 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package io.qameta.allure.junit5;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
-import io.qameta.allure.junit5.features.AfterEachFixtureFailureSupport;
+import io.qameta.allure.junit5.features.AfterEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.AllFixtureSupport;
-import io.qameta.allure.junit5.features.BeforeEachFixtureFailureSupport;
+import io.qameta.allure.junit5.features.BeforeAllFixtureFailureSupport;
+import io.qameta.allure.junit5.features.BeforeEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.EachFixtureSupport;
+import io.qameta.allure.junit5.features.ParameterisedBlankParameterValueTests;
+import io.qameta.allure.junit5.features.ParameterisedPrimitivesTests;
+import io.qameta.allure.junit5.features.ParameterisedTests;
+import io.qameta.allure.junit5.features.SkipOtherInjectables;
 import io.qameta.allure.junitplatform.AllureJunitPlatform;
 import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
@@ -36,9 +54,133 @@
  * @author charlie (Dmitry Baev).
  */
 @AllureFeatures.Fixtures
-@SuppressWarnings("unchecked")
 class AllureJunit5Test {
 
+    @Issue("697")
+    @Test
+    void shouldSupportEmptyStringParameters() {
+        final AllureResults results = runClasses(ParameterisedBlankParameterValueTests.class);
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getParameters().size())
+                .containsExactlyInAnyOrder(
+                        tuple("first(String) [1] value=", 2),
+                        tuple("first(String) [2] value=   ", 2),
+                        tuple("first(String) [3] value=null", 2)
+                );
+    }
+
+    @Test
+    void shouldSupportPrimitiveTypeParameters() {
+        final AllureResults results = runClasses(ParameterisedPrimitivesTests.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getParameters().size())
+                .containsExactlyInAnyOrder(
+                        tuple("booleansMethodSource(boolean, boolean) [1] a=true, b=true", 3),
+                        tuple("booleansMethodSource(boolean, boolean) [2] a=true, b=false", 3),
+                        tuple("booleansMethodSource(boolean, boolean) [3] a=false, b=true", 3),
+                        tuple("booleansMethodSource(boolean, boolean) [4] a=false, b=false", 3),
+                        tuple("floats(float) [1] value=0.1", 2),
+                        tuple("floats(float) [2] value=0.01", 2),
+                        tuple("shorts(int) [1] value=1", 2),
+                        tuple("shorts(int) [2] value=2", 2),
+                        tuple("shorts(int) [3] value=3", 2),
+                        tuple("ints(int) [1] value=1", 2),
+                        tuple("ints(int) [2] value=2", 2),
+                        tuple("ints(int) [3] value=3", 2),
+                        tuple("bytes(byte) [1] value=0", 2),
+                        tuple("bytes(byte) [2] value=1", 2),
+                        tuple("chars(char) [1] value=a", 2),
+                        tuple("chars(char) [2] value=b", 2),
+                        tuple("chars(char) [3] value=c", 2),
+                        tuple("longs(long) [1] value=0", 2),
+                        tuple("longs(long) [2] value=1", 2),
+                        tuple("nullMethodSource(String, Long) [1] stringValue=null, longValue=null", 3),
+                        tuple("doubles(double) [1] value=0.1", 2),
+                        tuple("doubles(double) [2] value=0.01", 2),
+                        tuple("booleans(boolean) [1] value=true", 2),
+                        tuple("booleans(boolean) [2] value=false", 2)
+                );
+    }
+
+    @Test
+    void shouldSupportParametersForParameterisedTests() {
+        final AllureResults results = runClasses(ParameterisedTests.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "first(String) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "a", null, null)
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "first(String) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "b", null, null)
+                );
+
+    }
+
+    @Test
+    void shouldSupportParamAnnotationForParameters() {
+        final AllureResults results = runClasses(ParameterisedTests.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "third(String) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("some value", "a", Parameter.Mode.DEFAULT, false)
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "third(String) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("some value", "b", Parameter.Mode.DEFAULT, false)
+                );
+
+    }
+
+    @Test
+    void shouldSkipReportingOfTestInjectablesTestReporterForRegularTest() {
+        final AllureResults results = runClasses(SkipOtherInjectables.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.SkipOtherInjectables.regularTestWithReporterInjection")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .isEmpty();
+    }
+
+    @Test
+    void shouldSkipReportingOfTestInjectablesTestReporterForParameterisedTest() {
+        final AllureResults results = runClasses(SkipOtherInjectables.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.SkipOtherInjectables.testReporterInjection")
+                .filteredOn("name", "testReporterInjection(String, TestReporter) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "a", null, null)
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.SkipOtherInjectables.testReporterInjection")
+                .filteredOn("name", "testReporterInjection(String, TestReporter) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "b", null, null)
+                );
+    }
+
     @Test
     void shouldSupportBeforeEachFixture() {
         final AllureResults results = runClasses(EachFixtureSupport.class);
@@ -199,8 +341,8 @@ void shouldSupportStepsInAfterAllFixture() {
     }
 
     @Test
-    void shouldSupportFailureInBeforeEachFixture() {
-        final AllureResults results = runClasses(BeforeEachFixtureFailureSupport.class);
+    void shouldSupportBrokenInBeforeEachFixture() {
+        final AllureResults results = runClasses(BeforeEachFixtureBrokenSupport.class);
 
         assertThat(results.getTestResults())
                 .hasSize(1);
@@ -222,8 +364,8 @@ void shouldSupportFailureInBeforeEachFixture() {
     }
 
     @Test
-    void shouldSupportFailureInAfterEachFixture() {
-        final AllureResults results = runClasses(AfterEachFixtureFailureSupport.class);
+    void shouldSupportBrokenInAfterEachFixture() {
+        final AllureResults results = runClasses(AfterEachFixtureBrokenSupport.class);
 
         assertThat(results.getTestResults())
                 .hasSize(1);
@@ -244,37 +386,47 @@ void shouldSupportFailureInAfterEachFixture() {
                 );
     }
 
+    @Test
+    void shouldSupportFailureInBeforeAllFixture() {
+        final AllureResults results = runClasses(BeforeAllFixtureFailureSupport.class);
+
+        assertThat(results.getTestResults())
+                .hasSize(1);
+
+        final TestResult testResult = results.getTestResults().get(0);
+
+        assertThat(results.getTestResultContainers())
+                .filteredOn("name", testResult.getName())
+                .flatExtracting(TestResultContainer::getChildren)
+                .contains(testResult.getUuid());
+
+        assertThat(results.getTestResultContainers())
+                .filteredOn("name", testResult.getName())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus, f -> f.getStatusDetails().getMessage())
+                .containsExactly(
+                        tuple("setUpAll", Status.FAILED, "Make the setUpAll failed")
+                );
+    }
+
     @Step("Run classes {classes}")
     private AllureResults runClasses(final Class<?>... classes) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
-
-        final ClassSelector[] classSelectors = Stream.of(classes)
-                .map(DiscoverySelectors::selectClass)
-                .toArray(ClassSelector[]::new);
-
-        final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
-                .selectors(classSelectors)
-                .build();
-
-        final LauncherConfig config = LauncherConfig.builder()
-                .enableTestExecutionListenerAutoRegistration(false)
-                .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
-                .build();
-        final Launcher launcher = LauncherFactory.create(config);
-
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final ClassSelector[] classSelectors = Stream.of(classes)
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
+
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
+                    .selectors(classSelectors)
+                    .build();
+
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .build();
+            final Launcher launcher = LauncherFactory.create(config);
             launcher.execute(request);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+        });
     }
-}
\ No newline at end of file
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
new file mode 100644
index 000000000..1f7ba67dd
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import io.qameta.allure.Allure;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AfterEachFixtureBrokenSupport {
+
+    @AfterEach
+    void tearDown() {
+        Allure.step("tearDown 1");
+        Allure.step("tearDown 2");
+        throw new RuntimeException("ta da");
+    }
+
+    @Test
+    void test1() {
+        Allure.step("test1 1");
+        Allure.step("test1 2");
+    }
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java
deleted file mode 100644
index d5fd76364..000000000
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.qameta.allure.junit5.features;
-
-import io.qameta.allure.Allure;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class AfterEachFixtureFailureSupport {
-
-    @AfterEach
-    void tearDown() {
-        Allure.step("tearDown 1");
-        Allure.step("tearDown 2");
-        throw new RuntimeException("ta da");
-    }
-
-    @Test
-    void test1() {
-        Allure.step("test1 1");
-        Allure.step("test1 2");
-    }
-}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
index f19bc65e6..923d4f75b 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
@@ -1,3 +1,18 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package io.qameta.allure.junit5.features;
 
 import io.qameta.allure.Allure;
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
new file mode 100644
index 000000000..6cf6f09b3
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import io.qameta.allure.Allure;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.fail;
+
+/**
+ * @author prafair (Pavel Novikov).
+ */
+public class BeforeAllFixtureFailureSupport {
+
+    @BeforeAll
+    static void setUpAll() {
+        Allure.step("setUpAll 1");
+        Allure.step("setUpAll 2");
+        fail("Make the setUpAll failed");
+    }
+
+    @Test
+    void test1() {
+        Allure.step("test1 1");
+        Allure.step("test1 2");
+    }
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
new file mode 100644
index 000000000..8084c1b56
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import io.qameta.allure.Allure;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class BeforeEachFixtureBrokenSupport {
+
+    @BeforeEach
+    void setUp() {
+        Allure.step("setUp 1");
+        Allure.step("setUp 2");
+        throw new RuntimeException("ta da");
+    }
+
+    @Test
+    void test1() {
+        Allure.step("test1 1");
+        Allure.step("test1 2");
+    }
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java
deleted file mode 100644
index f2f77d695..000000000
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.qameta.allure.junit5.features;
-
-import io.qameta.allure.Allure;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class BeforeEachFixtureFailureSupport {
-
-    @BeforeEach
-    void setUp() {
-        Allure.step("setUp 1");
-        Allure.step("setUp 2");
-        throw new RuntimeException("ta da");
-    }
-
-    @Test
-    void test1() {
-        Allure.step("test1 1");
-        Allure.step("test1 2");
-    }
-}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
index 5e723f39b..8231baf97 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
@@ -1,3 +1,18 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package io.qameta.allure.junit5.features;
 
 import io.qameta.allure.Allure;
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
new file mode 100644
index 000000000..ab53e4547
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedBlankParameterValueTests {
+
+    @ParameterizedTest
+    @MethodSource("arguments")
+    void first(String value) {
+    }
+
+    static Stream<String> arguments() {
+        return Stream.of(
+                "",
+                "   ",
+                null
+        );
+    }
+
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
new file mode 100644
index 000000000..1553e2a81
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedPrimitivesTests {
+
+    @ParameterizedTest
+    @ValueSource(bytes = {0, 1})
+    void bytes(byte value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(shorts = {1, 2, 3})
+    void shorts(int value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {1, 2, 3})
+    void ints(int value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(longs = {0L, 1L})
+    void longs(long value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(floats = {0.1f, 0.01f})
+    void floats(float value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(doubles = {0.1d, 0.01d})
+    void doubles(double value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(chars = {'a', 'b', 'c'})
+    void chars(char value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void booleans(boolean value) {
+    }
+
+    @ParameterizedTest
+    @MethodSource("arguments")
+    void booleansMethodSource(final boolean a, final boolean b) {
+    }
+
+    @ParameterizedTest
+    @MethodSource("nulls")
+    void nullMethodSource(final String stringValue,
+                          final Long longValue) {
+    }
+
+    static Stream<Arguments> arguments() {
+        return Stream.of(
+                Arguments.of(true, true),
+                Arguments.of(true, false),
+                Arguments.of(false, true),
+                Arguments.of(false, false)
+        );
+    }
+
+    static Stream<Arguments> nulls() {
+        return Stream.of(
+                Arguments.of(null, null)
+        );
+    }
+
+
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
new file mode 100644
index 000000000..3cbb9adc6
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
@@ -0,0 +1,49 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import io.qameta.allure.Param;
+import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedTests {
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void first(String value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void second(String value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void third(@Param("some value") String value) {
+    }
+
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void testReporterInjection(String value, TestReporter testReporter) {
+    }
+
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
new file mode 100644
index 000000000..9209f1ad7
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class SkipOtherInjectables {
+
+    @Test
+    void regularTestWithReporterInjection(TestReporter testReporter) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void testReporterInjection(String value, TestReporter testReporter) {
+    }
+
+}
diff --git a/allure-junit5/src/test/resources/allure.properties b/allure-junit5/src/test/resources/allure.properties
index 9c0b0a2d7..4c9c3b8ee 100644
--- a/allure-junit5/src/test/resources/allure.properties
+++ b/allure-junit5/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.link.issue.pattern=https://github.com/allure-framework/allure-java/issues/{}
diff --git a/allure-karate/build.gradle.kts b/allure-karate/build.gradle.kts
new file mode 100644
index 000000000..3a2c1ea7b
--- /dev/null
+++ b/allure-karate/build.gradle.kts
@@ -0,0 +1,56 @@
+description = "Allure Karate Integration"
+
+val karateVersion = "1.4.1"
+
+configurations {
+    testImplementation {
+        exclude(group="ch.qos.logback", module = "logback-classic")
+    }
+}
+
+dependencies {
+    api(project(":allure-java-commons"))
+    compileOnly("com.intuit.karate:karate-core:${karateVersion}")
+    implementation(project(":allure-test-filter"))
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("com.intuit.karate:karate-core:${karateVersion}")
+    testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.mock-server:mockserver-netty:5.15.0")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.karate"
+        ))
+    }
+    from("src/main/services") {
+        into("META-INF/services")
+    }
+}
+
+tasks.test {
+    systemProperty("junit.jupiter.execution.parallel.enabled", "false")
+    useJUnitPlatform()
+    exclude("**/features/*")
+}
+
+val spiOffJar: Jar by tasks.creating(Jar::class) {
+    from(sourceSets.getByName("main").output)
+    archiveClassifier.set("spi-off")
+}
+
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
+}
diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
new file mode 100644
index 000000000..6fa4e1cb8
--- /dev/null
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -0,0 +1,292 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.karate;
+
+import com.intuit.karate.RuntimeHook;
+import com.intuit.karate.core.Feature;
+import com.intuit.karate.core.FeatureRuntime;
+import com.intuit.karate.core.Result;
+import com.intuit.karate.core.Scenario;
+import com.intuit.karate.core.ScenarioResult;
+import com.intuit.karate.core.ScenarioRuntime;
+import com.intuit.karate.core.Step;
+import com.intuit.karate.core.StepResult;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.ResultsUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static io.qameta.allure.util.ResultsUtils.createLabel;
+import static io.qameta.allure.util.ResultsUtils.createLink;
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.md5;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings("MultipleStringLiterals")
+public class AllureKarate implements RuntimeHook {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureKarate.class);
+
+    private static final String ALLURE_UUID = "ALLURE_UUID";
+
+    private final AllureLifecycle lifecycle;
+
+    private final List<String> tcUuids = new ArrayList<>();
+
+    public AllureKarate() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureKarate(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public boolean beforeScenario(final ScenarioRuntime sr) {
+        final Feature feature = sr.featureRuntime.result.getFeature();
+        final String featureName = feature.getName();
+        final String featureNameQualified = feature.getResource().getRelativePath();
+        final Scenario scenario = sr.scenario;
+
+        final String uuid = UUID.randomUUID().toString();
+        sr.magicVariables.put(ALLURE_UUID, uuid);
+
+        final String nameOrLine = getName(scenario, String.valueOf(scenario.getLine()));
+        final String testCaseId = md5(String.format("%s:%s", featureNameQualified, nameOrLine));
+        final String fullName = String.format("%s:%d", featureNameQualified, scenario.getLine());
+        final TestResult result = new TestResult()
+                .setUuid(uuid)
+                .setFullName(fullName)
+                .setName(getName(scenario, fullName))
+                .setDescription(scenario.getDescription())
+                .setTestCaseId(testCaseId)
+                .setHistoryId(md5(scenario.getUniqueId()))
+                .setStage(Stage.RUNNING);
+
+        final List<String> labels = sr.tags.getTags();
+        final List<Label> allLabels = getLabels(labels);
+        allLabels.add(ResultsUtils.createFeatureLabel(featureName));
+        result.setLabels(allLabels);
+
+        final List<Link> links = getLinks(labels);
+        if (!links.isEmpty()) {
+            result.setLinks(links);
+        }
+
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestCase(uuid);
+        return true;
+    }
+
+    private static String getName(final Scenario scenario, final String defaultValue) {
+        if (Objects.isNull(scenario.getName())) {
+            return defaultValue;
+        }
+        final boolean blank = scenario.getName().chars()
+                .allMatch(Character::isWhitespace);
+        return blank ? defaultValue : scenario.getName().trim();
+    }
+
+    @Override
+    public void afterScenario(final ScenarioRuntime sr) {
+        final String uuid = (String) sr.magicVariables.get(ALLURE_UUID);
+        if (Objects.isNull(uuid)) {
+            return;
+        }
+        final Optional<ScenarioResult> maybeResult = Optional.of(sr)
+                .map(s -> s.result);
+
+        final Status status = !sr.isFailed()
+                ? Status.PASSED
+                : maybeResult
+                        .map(ScenarioResult::getError)
+                        .flatMap(ResultsUtils::getStatus)
+                        .orElse(null);
+
+        final StatusDetails statusDetails = maybeResult
+                .map(ScenarioResult::getError)
+                .flatMap(ResultsUtils::getStatusDetails)
+                .orElse(null);
+
+        final List<Parameter> list = new ArrayList<>();
+        if (sr.result != null && sr.result.getScenario().getExampleIndex() > -1) {
+            final Map<String, Object> data = sr.result.getScenario().getExampleData();
+            final Set<String> keys = data.keySet();
+            for (String key : keys) {
+                list.add(createParameter(key, sr.result.getScenario().getExampleData().get(key)));
+            }
+        }
+
+        lifecycle.updateTestCase(uuid, tr -> {
+            tr.setStage(Stage.FINISHED);
+            tr.setStatus(status);
+            tr.setStatusDetails(statusDetails);
+            tr.setParameters(list);
+        });
+
+        lifecycle.stopTestCase(uuid);
+        tcUuids.add(uuid);
+    }
+
+    @Override
+    public boolean beforeStep(final Step step,
+                              final ScenarioRuntime sr) {
+        final String parentUuid = (String) sr.magicVariables.get(ALLURE_UUID);
+        if (Objects.isNull(parentUuid)) {
+            return true;
+        }
+
+        if (step.getText().startsWith("call") || step.getText().startsWith("callonce")) {
+            return true;
+        }
+
+        final String uuid = parentUuid + "-" + step.getIndex();
+        final io.qameta.allure.model.StepResult stepResult = new io.qameta.allure.model.StepResult()
+                .setName(step.getText());
+
+        lifecycle.startStep(parentUuid, uuid, stepResult);
+
+        return true;
+    }
+
+    @Override
+    public void afterStep(final StepResult result,
+                          final ScenarioRuntime sr) {
+        final String parentUuid = (String) sr.magicVariables.get(ALLURE_UUID);
+        if (Objects.isNull(parentUuid)) {
+            return;
+        }
+
+        final Step step = result.getStep();
+        if (step.getText().startsWith("call") || step.getText().startsWith("callonce")) {
+            return;
+        }
+
+        final String uuid = parentUuid + "-" + step.getIndex();
+
+        final Result stepResult = result.getResult();
+
+        final Status status = !stepResult.isFailed()
+                ? Status.PASSED
+                : Optional.of(stepResult)
+                        .map(Result::getError)
+                        .flatMap(ResultsUtils::getStatus)
+                        .orElse(null);
+
+        final StatusDetails statusDetails = Optional.of(stepResult)
+                .map(Result::getError)
+                .flatMap(ResultsUtils::getStatusDetails)
+                .orElse(null);
+
+        lifecycle.updateStep(uuid, s -> {
+            s.setStatus(status);
+            s.setStatusDetails(statusDetails);
+        });
+        lifecycle.stopStep(uuid);
+
+        if (Objects.nonNull(result.getEmbeds())) {
+            result.getEmbeds().forEach(embed -> {
+                try (InputStream is = new BufferedInputStream(Files.newInputStream(embed.getFile().toPath()))) {
+                    lifecycle.addAttachment(
+                            embed.getFile().getName(),
+                            embed.getResourceType().contentType,
+                            embed.getResourceType().getExtension(),
+                            is
+                    );
+                } catch (IOException e) {
+                    LOGGER.warn("could not save embedding", e);
+                }
+            });
+        }
+
+    }
+
+    @Override
+    public void afterFeature(final FeatureRuntime fr) {
+        tcUuids.forEach(lifecycle::writeTestCase);
+    }
+
+    private List<Label> getLabels(final List<String> labels) {
+        final Map<String, String> allureLabels = new HashMap<>();
+        final List<Label> allLabels = new ArrayList<>();
+        for (String tag : labels.stream()
+                .filter(l -> l.contains("allure")).collect(Collectors.toList())) {
+            final String tagName = tag.substring(0, tag.indexOf(':'));
+            final String tagValue = tag.substring(tag.indexOf(':') + 1);
+            if (tagName.contains("allure.label")) {
+                allureLabels.put(
+                        tagName.substring("allure.label.".length()),
+                        tagValue
+                );
+            }
+            if (tagName.contains("allure.id")) {
+                allureLabels.put("AS_ID", tagValue);
+            }
+            if (tagName.contains("allure.severity")) {
+                allureLabels.put("severity", tagValue);
+            }
+        }
+        allureLabels.keySet().forEach(key -> allLabels.add(createLabel(key, allureLabels.get(key))));
+        return allLabels;
+    }
+
+    private List<Link> getLinks(final List<String> labels) {
+        final List<Link> allureLinks = new ArrayList<>();
+        for (String tag : labels.stream()
+                .filter(l -> l.contains("allure.link")).collect(Collectors.toList())) {
+            final String tagName = tag.substring(0, tag.indexOf(':'));
+            final String tagValue = tag.substring(tag.indexOf(':') + 1);
+            switch (tagName.substring("allure.link".length())) {
+                case "":
+                    allureLinks.add(createLink(tagValue, "", "", "custom"));
+                    break;
+                case ".tms":
+                    allureLinks.add(createLink(tagValue, "", "", "tms"));
+                    break;
+                case ".issue":
+                    allureLinks.add(createLink(tagValue, "", "", "issue"));
+                    break;
+                default:
+                    break;
+            }
+        }
+        return allureLinks;
+    }
+}
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
new file mode 100644
index 000000000..fedbd276f
--- /dev/null
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -0,0 +1,346 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.karate;
+
+import com.intuit.karate.Runner;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static io.qameta.allure.model.Status.BROKEN;
+import static io.qameta.allure.model.Status.PASSED;
+import static io.qameta.allure.util.ResultsUtils.md5;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings({"MultipleStringLiterals", "PMD.AvoidDuplicateLiterals"})
+class AllureKarateTest extends TestRunner {
+
+    @Test
+    void shouldCreateNameAndFullName() {
+        final AllureResults results = run("classpath:testdata/description-and-name.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getFullName)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Some api* request # comment 1",
+                                "testdata/description-and-name.feature:3"
+                        ),
+                        tuple(
+                                "testdata/description-and-name.feature:8",
+                                "testdata/description-and-name.feature:8"
+                        )
+                );
+    }
+
+    @Test
+    void shouldCreateDescription() {
+        final AllureResults results = run("classpath:testdata/description-and-name.feature");
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getDescription, TestResult::getDescriptionHtml)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Request '//user' & get 20* code, ...",
+                                null
+                        ),
+                        tuple(
+                                "",
+                                null
+                        )
+                );
+    }
+
+    @Test
+    void shouldCreateStartAndStopTimeslots() {
+        final AllureResults results = runApi("classpath:testdata/api.feature");
+
+        final TestResult tr1 = results.getTestResults().get(0);
+        final TestResult tr2 = results.getTestResults().get(1);
+
+        assertThat(tr2.getStop())
+                .isGreaterThan(tr2.getStart())
+                .isGreaterThan(tr1.getStop());
+    }
+
+    @Test
+    void shouldCreateStatusAndStage() {
+        final AllureResults results = run("classpath:testdata/api.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Simple post request")
+                .extracting(TestResult::getStatus, TestResult::getStage)
+                .containsExactlyInAnyOrder(
+                        tuple(BROKEN, Stage.FINISHED)
+                );
+    }
+
+    @Test
+    void shouldNotCreateStatusDetailsIfTestPassed() {
+        final AllureResults results = runApi("classpath:testdata/api.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Simple get request")
+                .extracting(TestResult::getStatus, TestResult::getStatusDetails)
+                .containsExactlyInAnyOrder(
+                        tuple(PASSED, null)
+                );
+    }
+
+    @Test
+    void shouldCreateStatusDetailsIfTestFailed() {
+        final AllureResults results = runApi("classpath:testdata/api.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Simple post request")
+                .extracting(
+                        TestResult::getStatus,
+                        result -> result.getStatusDetails().getMessage().substring(0, 35),
+                        result -> result.getStatusDetails().getTrace().substring(0, 70)
+                )
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                BROKEN,
+                                "status code was: 401, expected: 200",
+                                "com.intuit.karate.KarateException: status code was: 401, expected: 200"
+                        )
+                );
+    }
+
+    @Test
+    void shouldCreateTestCaseIdAndName() {
+        final AllureResults results = run("classpath:testdata/description-and-name.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getTestCaseId, TestResult::getTestCaseName)
+                .containsExactlyInAnyOrder(
+                        tuple(md5("testdata/description-and-name.feature:Some api* request # comment 1"), null),
+                        tuple(md5("testdata/description-and-name.feature:8"), null)
+                );
+    }
+
+    @Test
+    void shouldCreateTestCaseIdAndNamesOfParametrizedTest() {
+        final AllureResults results = runApi("classpath:testdata/parametrized-test.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple("/login should return 200", md5("testdata/parametrized-test.feature:/login should return 200")),
+                        tuple("/user should return 301", md5("testdata/parametrized-test.feature:/user should return 301")),
+                        tuple("/pages should return 404", md5("testdata/parametrized-test.feature:/pages should return 404"))
+                );
+    }
+
+    @Test
+    void shouldCreateParamsForParametrizedTest() {
+        final AllureResults results = runApi("classpath:testdata/parametrized-test.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "/login should return 200")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("path", "login"),
+                        tuple("status", "200")
+                );
+    }
+
+    @Test
+    void shouldCreateHistoryIdAndNamesOfParametrizedTest() {
+        final AllureResults results = runApi("classpath:testdata/parametrized-test.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getHistoryId)
+                .containsExactlyInAnyOrder(
+                        tuple("/login should return 200", md5("testdata.parametrized-test_1_1")),
+                        tuple("/user should return 301", md5("testdata.parametrized-test_1_2")),
+                        tuple("/pages should return 404", md5("testdata.parametrized-test_1_3"))
+                );
+    }
+
+    @Test
+    void shouldCreateLabels() {
+        final AllureResults results = run("classpath:testdata/tags.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test with labels")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("feature", "labels"),
+                        tuple("epic", "epic1"),
+                        tuple("story", "story1"),
+                        tuple("tag", "some_tag")
+                );
+    }
+
+    @Test
+    void shouldCreateSpecialLabels() {
+        final AllureResults results = run("classpath:testdata/tags.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test with owner, id and layer")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("feature", "labels"),
+                        tuple("AS_ID", "141413"),
+                        tuple("owner", "npolly"),
+                        tuple("layer", "unit_tests"),
+                        tuple("severity", "blocker")
+                );
+    }
+
+    @Test
+    void shouldNotCreateTagLabel() {
+        final AllureResults results = run("classpath:testdata/tags.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test without allure labels")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactly(
+                        tuple("feature", "labels")
+                );
+    }
+
+    @Test
+    void shouldCreateLinks() {
+        final AllureResults results = run("classpath:testdata/links.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test with links")
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("http://localhost:8080", "custom"),
+                        tuple("http://localhost:8080", "tms"),
+                        tuple("http://localhost:8080", "issue")
+                );
+    }
+
+    @Test
+    void shouldCreateApiTestSteps() {
+        final AllureResults results = runApi("classpath:testdata/steps.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "f1 - s1")
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactlyInAnyOrder(
+                        "print 'first feature:@smoke, first scenario'",
+                        "url 'http://localhost:8081'",
+                        "path '/login'",
+                        "method get",
+                        "status 200"
+                );
+    }
+
+    @Test
+    void shouldCreateResultWithEmptySteps() {
+        final AllureResults results = runApi("classpath:testdata/steps.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "f1 - s2")
+                .flatExtracting(TestResult::getSteps)
+                .isEmpty();
+    }
+
+    @Test
+    void shouldCreateStepsStatuses() {
+        final AllureResults results = run("classpath:testdata/steps.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "f1 - s1")
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getStatus)
+                .containsExactly(
+                        PASSED,
+                        PASSED,
+                        PASSED,
+                        BROKEN
+                );
+    }
+
+    @Test
+    @Disabled
+    @SuppressWarnings("PMD.JUnitTestContainsTooManyAsserts")
+    void shouldCreateAttachmentForFailedStep() {
+        final AllureResults results = run("classpath:testdata/screenshot.feature");
+
+        assertThat(results.getTestResults().get(0).getAttachments().get(0).getName()).contains("screenshot_1");
+        assertThat(results.getTestResults().get(1).getAttachments().get(0).getName()).contains("screenshot_2");
+    }
+
+    @Test
+    @Disabled
+    @SuppressWarnings("PMD.JUnitTestContainsTooManyAsserts")
+    void shouldCreateAttachments() {
+        final AllureResults results = run("classpath:testdata/web.feature");
+
+        assertThat(results.getTestResults().get(0).getAttachments().size()).isEqualTo(2);
+
+        final String firstAttachment = results.getTestResults().get(0).getAttachments().get(0).getName();
+        final String secondAttachment = results.getTestResults().get(0).getAttachments().get(1).getName();
+
+        assertThat(firstAttachment).contains("web_1");
+        assertThat(secondAttachment).contains("web_1");
+
+        final String firstAttachmentDateCreated = firstAttachment.substring(
+                firstAttachment.lastIndexOf('_') + 1,
+                firstAttachment.lastIndexOf('.')
+        );
+        final String secondAttachmentDateCreated = secondAttachment.substring(
+                secondAttachment.lastIndexOf('_') + 1,
+                secondAttachment.lastIndexOf('.')
+        );
+
+        assertThat(Long.parseLong(secondAttachmentDateCreated))
+                .isGreaterThan(Long.parseLong(firstAttachmentDateCreated));
+    }
+
+    @Test
+    void shouldSkipCallAndCallOnceStepsInBeforeStep() {
+        final AllureResults results = runApi("classpath:testdata/call-callonce.feature");
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .doesNotContain("call", "callonce");
+    }
+
+    @Test
+    void buildTest() {
+        Runner.builder()
+                .path("classpath:testdata/greeting.feature")
+                .hook(new AllureKarate())
+                .backupReportDir(false)
+                .outputJunitXml(false)
+                .outputCucumberJson(false)
+                .outputHtmlReport(false)
+                .parallel(1);
+    }
+}
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
new file mode 100644
index 000000000..a8300251a
--- /dev/null
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
@@ -0,0 +1,80 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.karate;
+
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.model.HttpRequest;
+import org.mockserver.model.HttpResponse;
+import org.mockserver.netty.MockServer;
+
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+@SuppressWarnings("MultipleStringLiterals")
+public class TestRunner {
+
+    private MockServer server;
+    private MockServerClient client;
+
+    AllureResults runApi(final String... featurePath) {
+        server = new MockServer(8081);
+        client = new MockServerClient("localhost", server.getLocalPort());
+
+        final HttpRequest interceptReq1 = request("/login").withMethod("GET");
+        final HttpResponse mockResponse1 = response().withStatusCode(200);
+        client.when(interceptReq1).respond(mockResponse1);
+
+        final HttpRequest interceptReq2 = request("/login").withMethod("POST");
+        final HttpResponse mockResponse2 = response().withStatusCode(401).withBody("[{\"message\": \"No access\"}]");
+        client.when(interceptReq2).respond(mockResponse2);
+
+        final HttpRequest interceptReq3 = request("/user").withMethod("GET");
+        final HttpResponse mockResponse3 = response().withStatusCode(301);
+        client.when(interceptReq3).respond(mockResponse3);
+
+        final HttpRequest interceptReq4 = request("/pages").withMethod("GET");
+        final HttpResponse mockResponse4 = response().withStatusCode(404);
+        client.when(interceptReq4).respond(mockResponse4);
+
+        return run(featurePath);
+    }
+
+    AllureResults run(final String... path) {
+        return RunUtils.runTests(lifecycle -> {
+            final AllureKarate allureKarate = new AllureKarate(lifecycle);
+
+            try {
+                com.intuit.karate.Runner.builder()
+                        .path(path)
+                        .hook(allureKarate)
+                        .backupReportDir(false)
+                        .outputJunitXml(false)
+                        .outputCucumberJson(false)
+                        .outputHtmlReport(false)
+                        .parallel(1);
+            } finally {
+                if (server != null && server.isRunning()) {
+                    server.stop();
+                }
+                if (client != null && !client.hasStopped()) {
+                    client.stop();
+                }
+            }
+        });
+    }
+}
diff --git a/allure-karate/src/test/resources/testdata/api.feature b/allure-karate/src/test/resources/testdata/api.feature
new file mode 100644
index 000000000..52e5808ef
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/api.feature
@@ -0,0 +1,16 @@
+Feature: Simple API tests
+
+#  Background:
+#    * url 'https://qameta.testops.cloud/api/login/props'
+
+  Scenario: Simple get request
+    * url 'http://localhost:8081'
+    * path '/login'
+    When method get
+    Then status 200
+
+  Scenario: Simple post request
+    * url 'http://localhost:8081'
+    * path '/login'
+    When method post
+    Then status 200
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/apiResponse.feature b/allure-karate/src/test/resources/testdata/apiResponse.feature
new file mode 100644
index 000000000..74577f639
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/apiResponse.feature
@@ -0,0 +1,13 @@
+Feature: API tests
+
+  Scenario: Get request with response body
+    Given path 'https://mysite.example.api.com/users'
+    When method get
+    Then status 200
+    And match response == [{ id: '1', name: 'Soul' }, { id: '2', name: 'Kate' }]
+
+  Scenario: Post request with response body
+    Given path 'https://mysite.example.api.com/users/login'
+    When method post
+    Then status 200
+    And match response == { message: 'User logged in', error: null }
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/call-callonce.feature b/allure-karate/src/test/resources/testdata/call-callonce.feature
new file mode 100644
index 000000000..e64bbf049
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/call-callonce.feature
@@ -0,0 +1,13 @@
+Feature: Call & Call once Feature
+  This feature calls another feature and demonstrates Allure reporting issue.
+
+  @smoke
+  Scenario: Main Scenario with a call
+    Given url 'https://jsonplaceholder.typicode.com'
+    When method GET
+    Then status 200
+
+    * call read('classpath:testdata/apiResponse.feature')
+    * callonce read('classpath:testdata/api.feature')
+
+    Then print 'Main scenario completed.'
diff --git a/allure-karate/src/test/resources/testdata/description-and-name.feature b/allure-karate/src/test/resources/testdata/description-and-name.feature
new file mode 100644
index 000000000..6dafde360
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/description-and-name.feature
@@ -0,0 +1,10 @@
+Feature: API tests for AT
+
+  Scenario: Some api* request # comment 1
+  Request '//user' & get 20* code, ...
+  # comment 2
+    * print 'First step'
+
+  Scenario:
+    # comment 3
+    * print 'Second step'
diff --git a/allure-karate/src/test/resources/testdata/greeting.feature b/allure-karate/src/test/resources/testdata/greeting.feature
new file mode 100644
index 000000000..0cf1943ac
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/greeting.feature
@@ -0,0 +1,19 @@
+Feature: greeting end-point
+
+Background:
+* url demoBaseUrl
+
+Scenario: get default greeting
+
+    Given path 'greeting'
+    When method get
+    Then status 200
+    And match response == { id: '#number', content: 'Hello World!' }
+
+Scenario: get custom greeting
+
+    Given path 'greeting'
+    And param name = 'Billie'
+    When method get
+    Then status 200
+    And match response == { id: '#number', content: 'Hello Billie!' }
diff --git a/allure-karate/src/test/resources/testdata/links.feature b/allure-karate/src/test/resources/testdata/links.feature
new file mode 100644
index 000000000..b1014595a
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/links.feature
@@ -0,0 +1,8 @@
+Feature: links
+
+  @allure.link:http://localhost:8080
+  @allure.link.tms:http://localhost:8080
+  @allure.link.issue:http://localhost:8080
+  Scenario: Test with links
+    * print 'First step'
+    * print 'Second step'
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/parametrized-test.feature b/allure-karate/src/test/resources/testdata/parametrized-test.feature
new file mode 100644
index 000000000..884647a73
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/parametrized-test.feature
@@ -0,0 +1,13 @@
+Feature: Parameterized tests
+
+  Scenario Outline: /<path> should return <status>
+    * url 'http://localhost:8081'
+    Given path '/<path>'
+    When method get
+    Then status <status>
+
+    Examples:
+      | path   | status  |
+      | login  | 200     |
+      | user   | 301     |
+      | pages  | 404     |
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/screenshot.feature b/allure-karate/src/test/resources/testdata/screenshot.feature
new file mode 100644
index 000000000..b105e2726
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/screenshot.feature
@@ -0,0 +1,12 @@
+Feature: attachments
+
+  Background:
+    * configure driver = { type: 'chrome', timeout: 5000, screenshotOnFailure: true, showDriverLog: true }
+
+  Scenario: Screenshot attachment
+    Given driver 'https://docs.qameta.io/allure-testops/'
+    Then match true == false
+
+  Scenario: Screenshot attachment
+    Given driver 'https://docs.qameta.io/allure-testops/'
+    Then match false == true
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/steps.feature b/allure-karate/src/test/resources/testdata/steps.feature
new file mode 100644
index 000000000..6be111586
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/steps.feature
@@ -0,0 +1,16 @@
+@smoke
+Feature: tags demo - first
+    run the following example from the command line:
+    mvn test -Dcucumber.options="--tags @smoke" -Dtest=TagsRunner
+
+Scenario: f1 - s1
+    * print 'first feature:@smoke, first scenario'
+    * url 'http://localhost:8081'
+    * path '/login'
+    When method get
+    # comment
+    Then status 200
+
+@fire
+Scenario: f1 - s2
+    #* print 'first feature:@smoke, second scenario:@fire'
diff --git a/allure-karate/src/test/resources/testdata/tags.feature b/allure-karate/src/test/resources/testdata/tags.feature
new file mode 100644
index 000000000..726a00773
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/tags.feature
@@ -0,0 +1,21 @@
+Feature: labels
+
+  @allure.label.epic:epic1
+  @allure.label.story:story1
+  @allure.label.tag:some_tag
+  Scenario: Test with labels
+    * print 'First step'
+    * print 'Second step'
+
+  @allure.id:141413
+  @allure.label.owner:npolly
+  @allure.label.layer:unit_tests
+  @allure.severity:blocker
+  Scenario: Test with owner, id and layer
+    * print 'First step'
+    * print 'Second step'
+
+  @Karate_tag:1
+  Scenario: Test without allure labels
+    * print 'First step'
+    * print 'Second step'
diff --git a/allure-karate/src/test/resources/testdata/web.feature b/allure-karate/src/test/resources/testdata/web.feature
new file mode 100644
index 000000000..1a4737b68
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/web.feature
@@ -0,0 +1,20 @@
+Feature: browser automation 1
+
+  Background:
+   * configure driver = { type: 'chrome' }
+  # * configure driverTarget = { docker: 'justinribeiro/chrome-headless', showDriverLog: true }
+  # * configure driverTarget = { docker: 'ptrthomas/karate-chrome', showDriverLog: true }
+  # * configure driver = { type: 'chromedriver', showDriverLog: true }
+  # * configure driver = { type: 'geckodriver', showDriverLog: true }
+  # * configure driver = { type: 'safaridriver', showDriverLog: true }
+  # * configure driver = { type: 'iedriver', showDriverLog: true, httpConfig: { readTimeout: 120000 } }
+
+  Scenario: try to login to github
+
+    Given driver 'https://github.com/login'
+    And screenshot()
+    And input('#login_field', 'dummy')
+    And input('#password', 'world')
+    And screenshot()
+    When submit().click("input[name=commit]")
+    Then match html('#js-flash-container') contains 'Incorrect username or password.'
diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts
index 507dfdf45..056557707 100644
--- a/allure-model/build.gradle.kts
+++ b/allure-model/build.gradle.kts
@@ -1,10 +1,6 @@
 description = "Allure Model Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
-    implementation("com.fasterxml.jackson.core:jackson-databind")
     testImplementation("io.github.benas:random-beans")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
@@ -23,7 +19,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Allure2ModelJackson.java b/allure-model/src/main/java/io/qameta/allure/model/Allure2ModelJackson.java
deleted file mode 100644
index 6832b5b58..000000000
--- a/allure-model/src/main/java/io/qameta/allure/model/Allure2ModelJackson.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.model;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
-import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
-import static com.fasterxml.jackson.databind.MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME;
-import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("PMD.ClassNamingConventions")
-public final class Allure2ModelJackson {
-
-    public static final String INDENT_OUTPUT_PROPERTY_NAME = "allure.results.indentOutput";
-
-    private Allure2ModelJackson() {
-        throw new IllegalStateException("Do not instance Allure2ModelJackson");
-    }
-
-    public static ObjectMapper createMapper() {
-        return new ObjectMapper()
-                .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
-                .setSerializationInclusion(NON_NULL)
-                .configure(INDENT_OUTPUT, Boolean.getBoolean(INDENT_OUTPUT_PROPERTY_NAME))
-                .registerModule(new SimpleModule()
-                        .addDeserializer(Status.class, new StatusDeserializer())
-                        .addDeserializer(Stage.class, new StageDeserializer())
-                );
-    }
-}
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
index fcf57ab6d..ef938f240 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,37 +18,36 @@
 import java.io.Serializable;
 
 /**
- * POJO that stores attachment information.
+ * The model object that used to link attachment files, stored in results directory,
+ * to test results.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithAttachments
+ * @since 2.0
  */
 public class Attachment implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String source;
-
-    protected String type;
+    private String name;
+    private String source;
+    private String type;
+    private Long size;
 
     /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * Gets name.
+     *
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public Attachment setName(final String value) {
         this.name = value;
@@ -56,24 +55,19 @@ public Attachment setName(final String value) {
     }
 
     /**
-     * Gets the value of the source property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * Gets source.
+     *
+     * @return the source
      */
     public String getSource() {
         return source;
     }
 
     /**
-     * Sets the value of the source property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * Sets source.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public Attachment setSource(final String value) {
         this.source = value;
@@ -81,24 +75,19 @@ public Attachment setSource(final String value) {
     }
 
     /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * Gets type.
+     *
+     * @return the type
      */
     public String getType() {
         return type;
     }
 
     /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * Sets type.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public Attachment setType(final String value) {
         this.type = value;
@@ -106,26 +95,23 @@ public Attachment setType(final String value) {
     }
 
     /**
-     * @deprecated use set method
+     * Gets size.
+     *
+     * @return the size
      */
-    @Deprecated
-    public Attachment withName(final String value) {
-        return setName(value);
+    public Long getSize() {
+        return size;
     }
 
     /**
-     * @deprecated use set method
+     * Sets size.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    public Attachment withSource(final String value) {
-        return setSource(value);
+    public Attachment setSize(final Long value) {
+        this.size = value;
+        return this;
     }
 
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public Attachment withType(final String value) {
-        return setType(value);
-    }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
index e6de82585..714a30b17 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,435 +15,16 @@
  */
 package io.qameta.allure.model;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 /**
- * POJO that stores common information about executable items.
+ * Marker interface for model objects that holds information about
+ * executable items, like test results, fixture results or steps.
  *
- * @deprecated scheduled to removal in 3.0 release.
+ * @author charlie (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
  */
-@Deprecated
-@SuppressWarnings("PMD.ExcessivePublicCount")
-public abstract class ExecutableItem implements Serializable, WithAttachments,
+public interface ExecutableItem extends WithAttachments,
         WithParameters, WithStatusDetails, WithSteps {
 
-    private static final long serialVersionUID = 1L;
-
-    protected String name;
-
-    protected Status status;
-
-    protected StatusDetails statusDetails;
-
-    protected Stage stage;
-
-    protected String description;
-
-    protected String descriptionHtml;
-
-    protected List<StepResult> steps;
-
-    protected List<Attachment> attachments;
-
-    protected List<Parameter> parameters;
-
-    protected Long start;
-
-    protected Long stop;
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public ExecutableItem setName(final String value) {
-        this.name = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the status property.
-     *
-     * @return possible object is
-     * {@link Status }
-     */
-    @Override
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     *
-     * @param value allowed object is
-     *              {@link Status }
-     */
-    public ExecutableItem setStatus(final Status value) {
-        this.status = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the statusDetails property.
-     *
-     * @return possible object is
-     * {@link StatusDetails }
-     */
-    @Override
-    public StatusDetails getStatusDetails() {
-        return statusDetails;
-    }
-
-    /**
-     * Sets the value of the statusDetails property.
-     *
-     * @param value allowed object is
-     *              {@link StatusDetails }
-     */
-    public ExecutableItem setStatusDetails(final StatusDetails value) {
-        this.statusDetails = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the stage property.
-     *
-     * @return possible object is
-     * {@link Stage }
-     */
-    public Stage getStage() {
-        return stage;
-    }
-
-    /**
-     * Sets the value of the stage property.
-     *
-     * @param value allowed object is
-     *              {@link Stage }
-     */
-    public ExecutableItem setStage(final Stage value) {
-        this.stage = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public ExecutableItem setDescription(final String value) {
-        this.description = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the descriptionHtml property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getDescriptionHtml() {
-        return descriptionHtml;
-    }
-
-    /**
-     * Sets the value of the descriptionHtml property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public ExecutableItem setDescriptionHtml(final String value) {
-        this.descriptionHtml = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the start property.
-     *
-     * @return possible object is
-     * {@link Long }
-     */
-    public Long getStart() {
-        return start;
-    }
-
-    /**
-     * Sets the value of the start property.
-     *
-     * @param value allowed object is
-     *              {@link Long }
-     */
-    public ExecutableItem setStart(final Long value) {
-        this.start = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the stop property.
-     *
-     * @return possible object is
-     * {@link Long }
-     */
-    public Long getStop() {
-        return stop;
-    }
-
-    /**
-     * Sets the value of the stop property.
-     *
-     * @param value allowed object is
-     *              {@link Long }
-     */
-    public ExecutableItem setStop(final Long value) {
-        this.stop = value;
-        return this;
-    }
-
-    @Override
-    public List<StepResult> getSteps() {
-        if (steps == null) {
-            steps = new ArrayList<>();
-        }
-        return steps;
-    }
-
-    public ExecutableItem setSteps(final List<StepResult> steps) {
-        this.steps = steps;
-        return this;
-    }
-
-    public ExecutableItem setSteps(final StepResult... values) {
-        if (values != null) {
-            for (StepResult value : values) {
-                getSteps().add(value);
-            }
-        }
-        return this;
-    }
-
-    public ExecutableItem setSteps(final Collection<StepResult> values) {
-        if (values != null) {
-            getSteps().addAll(values);
-        }
-        return this;
-    }
-
-    @Override
-    public List<Attachment> getAttachments() {
-        if (attachments == null) {
-            attachments = new ArrayList<>();
-        }
-        return attachments;
-    }
-
-    public ExecutableItem setAttachments(final List<Attachment> attachments) {
-        this.attachments = attachments;
-        return this;
-    }
-
-    public ExecutableItem setAttachments(final Attachment... values) {
-        if (values != null) {
-            for (Attachment value : values) {
-                getAttachments().add(value);
-            }
-        }
-        return this;
-    }
-
-    public ExecutableItem setAttachments(final Collection<Attachment> values) {
-        if (values != null) {
-            getAttachments().addAll(values);
-        }
-        return this;
-    }
-
-    @Override
-    public List<Parameter> getParameters() {
-        if (parameters == null) {
-            parameters = new ArrayList<>();
-        }
-        return parameters;
-    }
-
-    public ExecutableItem setParameters(final List<Parameter> parameters) {
-        this.parameters = parameters;
-        return this;
-    }
-
-    public ExecutableItem setParameters(final Parameter... values) {
-        if (values != null) {
-            for (Parameter value : values) {
-                getParameters().add(value);
-            }
-        }
-        return this;
-    }
-
-    public ExecutableItem setParameters(final Collection<Parameter> values) {
-        if (values != null) {
-            getParameters().addAll(values);
-        }
-        return this;
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withName(final String value) {
-        return setName(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStatus(final Status value) {
-        return setStatus(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStage(final Stage value) {
-        return setStage(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withDescription(final String value) {
-        return setDescription(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStart(final Long value) {
-        return setStart(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStop(final Long value) {
-        return setStop(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withSteps(final StepResult... values) {
-        return setSteps(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withAttachments(final Attachment... values) {
-        return setAttachments(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withParameters(final Parameter... values) {
-        return setParameters(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
-    }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java b/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
index ff1eb229e..20e7b3cdc 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,306 +16,281 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 /**
- * POJO that stores fixture result information.
+ * The model object that stores information about executed test fixtures (set up and tear down methods).
+ * In order to link test fixture to test result {@link TestResultContainer} is used.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @see io.qameta.allure.model.TestResultContainer
+ * @since 2.0
  */
-@SuppressWarnings("deprecation")
-public class FixtureResult extends ExecutableItem implements Serializable {
+public class FixtureResult implements Serializable, ExecutableItem {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public FixtureResult setName(final String value) {
-        super.setName(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStatus(final Status value) {
-        super.setStatus(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStatusDetails(final StatusDetails value) {
-        super.setStatusDetails(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStage(final Stage value) {
-        super.setStage(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setDescription(final String value) {
-        super.setDescription(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setDescriptionHtml(final String value) {
-        super.setDescriptionHtml(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStart(final Long value) {
-        super.setStart(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStop(final Long value) {
-        super.setStop(value);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public FixtureResult setSteps(final List<StepResult> steps) {
-        super.setSteps(steps);
-        return this;
-    }
+    private String name;
+    private Status status;
+    private StatusDetails statusDetails;
+    private Stage stage;
+    private String description;
+    private String descriptionHtml;
+    private List<StepResult> steps = new ArrayList<>();
+    private List<Attachment> attachments = new ArrayList<>();
+    private List<Parameter> parameters = new ArrayList<>();
+    private Long start;
+    private Long stop;
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Gets name.
+     *
+     * @return the name
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setSteps(final StepResult... values) {
-        super.setSteps(values);
-        return this;
+    public String getName() {
+        return name;
     }
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setSteps(final Collection<StepResult> values) {
-        super.setSteps(values);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public FixtureResult setAttachments(final List<Attachment> attachments) {
-        super.setAttachments(attachments);
+    public FixtureResult setName(final String value) {
+        this.name = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Gets status.
+     *
+     * @return the status
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public FixtureResult setAttachments(final Attachment... values) {
-        super.setAttachments(values);
-        return this;
+    public Status getStatus() {
+        return status;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Sets status.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setAttachments(final Collection<Attachment> values) {
-        super.setAttachments(values);
+    public FixtureResult setStatus(final Status value) {
+        this.status = value;
         return this;
     }
 
+    /**
+     * Gets status details.
+     *
+     * @return the status details
+     */
     @Override
-    @JsonProperty
-    public FixtureResult setParameters(final List<Parameter> parameters) {
-        super.setParameters(parameters);
-        return this;
+    public StatusDetails getStatusDetails() {
+        return statusDetails;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Sets status details.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public FixtureResult setParameters(final Parameter... values) {
-        super.setParameters(values);
+    public FixtureResult setStatusDetails(final StatusDetails value) {
+        this.statusDetails = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Gets stage.
+     *
+     * @return the stage
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setParameters(final Collection<Parameter> values) {
-        super.setParameters(values);
-        return this;
+    public Stage getStage() {
+        return stage;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stage.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withName(final String value) {
-        return setName(value);
+    public FixtureResult setStage(final Stage value) {
+        this.stage = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description.
+     *
+     * @return the description
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStatus(final Status value) {
-        return setStatus(value);
+    public String getDescription() {
+        return description;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
+    public FixtureResult setDescription(final String value) {
+        this.description = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description html.
+     *
+     * @return the description html
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStage(final Stage value) {
-        return setStage(value);
+    public String getDescriptionHtml() {
+        return descriptionHtml;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description html.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withDescription(final String value) {
-        return setDescription(value);
+    public FixtureResult setDescriptionHtml(final String value) {
+        this.descriptionHtml = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets steps.
+     *
+     * @return the steps
      */
-    @Deprecated
     @Override
-    public FixtureResult withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
+    public List<StepResult> getSteps() {
+        return steps;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets steps.
+     *
+     * @param steps the steps
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStart(final Long value) {
-        return setStart(value);
+    public FixtureResult setSteps(final List<StepResult> steps) {
+        this.steps = steps;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets attachments.
+     *
+     * @return the attachments
      */
-    @Deprecated
     @Override
-    public FixtureResult withStop(final Long value) {
-        return setStop(value);
+    public List<Attachment> getAttachments() {
+        return attachments;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets attachments.
+     *
+     * @param attachments the attachments
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withSteps(final StepResult... values) {
-        return setSteps(values);
+    public FixtureResult setAttachments(final List<Attachment> attachments) {
+        this.attachments = attachments;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets parameters.
+     *
+     * @return the parameters
      */
-    @Deprecated
     @Override
-    public FixtureResult withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
+    public List<Parameter> getParameters() {
+        return parameters;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets parameters.
+     *
+     * @param parameters the parameters
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
+    public FixtureResult setParameters(final List<Parameter> parameters) {
+        this.parameters = parameters;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets start.
+     *
+     * @return the start
      */
-    @Deprecated
-    @Override
-    public FixtureResult withAttachments(final Attachment... values) {
-        return setAttachments(values);
+    public Long getStart() {
+        return start;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets start.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
+    public FixtureResult setStart(final Long value) {
+        this.start = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets stop.
+     *
+     * @return the stop
      */
-    @Deprecated
-    @Override
-    public FixtureResult withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
+    public Long getStop() {
+        return stop;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stop.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withParameters(final Parameter... values) {
-        return setParameters(values);
+    public FixtureResult setStop(final Long value) {
+        this.stop = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public FixtureResult withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final FixtureResult that = (FixtureResult) o;
+        return Objects.equals(name, that.name)
+                && status == that.status;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public FixtureResult withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
+    public int hashCode() {
+        return Objects.hash(name, status);
     }
-
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Label.java b/allure-model/src/main/java/io/qameta/allure/model/Label.java
index f9f5d19dc..af9c52595 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Label.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Label.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,33 +16,37 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores label information.
+ * The model object that could be used to pass additional metadata to test results.
+ * Note that labels with empty (blank) name will be omitted during report generation.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @since 2.0
  */
 public class Label implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String value;
+    private String name;
+    private String value;
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Label setName(final String value) {
         this.name = value;
@@ -50,20 +54,19 @@ public Label setName(final String value) {
     }
 
     /**
-     * Gets the value of the value property.
+     * Gets value.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the value
      */
     public String getValue() {
         return value;
     }
 
     /**
-     * Sets the value of the value property.
+     * Sets value.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Label setValue(final String value) {
         this.value = value;
@@ -71,18 +74,25 @@ public Label setValue(final String value) {
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Label withName(final String value) {
-        return setName(value);
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final Label label = (Label) o;
+        return Objects.equals(name, label.name) && Objects.equals(value, label.value);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Label withValue(final String value) {
-        return setValue(value);
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, value);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Link.java b/allure-model/src/main/java/io/qameta/allure/model/Link.java
index 57d241e5c..7009aee99 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Link.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Link.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,35 +16,38 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores link information.
+ * Model object that could be used to pass links to external resources to test results.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithLinks
+ * @see io.qameta.allure.model.TestResult
+ * @since 2.0
  */
 public class Link implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String url;
-
-    protected String type;
+    private String name;
+    private String url;
+    private String type;
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Link setName(final String value) {
         this.name = value;
@@ -52,20 +55,19 @@ public Link setName(final String value) {
     }
 
     /**
-     * Gets the value of the url property.
+     * Gets url.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the url
      */
     public String getUrl() {
         return url;
     }
 
     /**
-     * Sets the value of the url property.
+     * Sets url.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Link setUrl(final String value) {
         this.url = value;
@@ -73,20 +75,19 @@ public Link setUrl(final String value) {
     }
 
     /**
-     * Gets the value of the type property.
+     * Gets type.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the type
      */
     public String getType() {
         return type;
     }
 
     /**
-     * Sets the value of the type property.
+     * Sets type.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Link setType(final String value) {
         this.type = value;
@@ -94,26 +95,27 @@ public Link setType(final String value) {
     }
 
     /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public Link withName(final String value) {
-        return setName(value);
-    }
-
-    /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Link withUrl(final String value) {
-        return setUrl(value);
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final Link link = (Link) o;
+        return Objects.equals(name, link.name)
+                && Objects.equals(url, link.url)
+                && Objects.equals(type, link.type);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Link withType(final String value) {
-        return setType(value);
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, url, type);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Parameter.java b/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
index e89a395ca..6fbb0fb00 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,33 +16,48 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores parameter information.
+ * The model object that could be used to pass information about test parameters to test results.
+ * Note that parameters with empty (blank) name will be omitted during report generation.
+ * <p>
+ * Parameters are used in history key generation for test results. In general words,
+ * if test's results have the same parameters they will be considered as retries. But if
+ * at least one parameter is differ (or, for example, missed) results will be considered
+ * as separate results.
+ * <p>
+ * You can exclude parameters from history key calculation by setting {@link #excluded} property
+ * to <code>true</code>.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @see io.qameta.allure.model.WithParameters
+ * @since 2.0
  */
 public class Parameter implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String value;
+    private String name;
+    private String value;
+    private Boolean excluded;
+    private Mode mode;
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public Parameter setName(final String value) {
         this.name = value;
@@ -50,20 +65,19 @@ public Parameter setName(final String value) {
     }
 
     /**
-     * Gets the value of the value property.
+     * Gets value.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the value
      */
     public String getValue() {
         return value;
     }
 
     /**
-     * Sets the value of the value property.
+     * Sets value.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public Parameter setValue(final String value) {
         this.value = value;
@@ -71,18 +85,91 @@ public Parameter setValue(final String value) {
     }
 
     /**
-     * @deprecated use set method
+     * Gets excluded.
+     *
+     * @return the excluded
      */
-    @Deprecated
-    public Parameter withName(final String value) {
-        return setName(value);
+    public Boolean getExcluded() {
+        return excluded;
     }
 
     /**
-     * @deprecated use set method
+     * Sets excluded.
+     *
+     * @param excluded the excluded
+     * @return self for method chaining.
      */
-    @Deprecated
-    public Parameter withValue(final String value) {
-        return setValue(value);
+    public Parameter setExcluded(final Boolean excluded) {
+        this.excluded = excluded;
+        return this;
+    }
+
+    /**
+     * Gets mode.
+     *
+     * @return the mode
+     */
+    public Mode getMode() {
+        return mode;
+    }
+
+    /**
+     * Sets mode.
+     *
+     * @param mode the mode
+     * @return self for method chaining.
+     */
+    public Parameter setMode(final Mode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final Parameter parameter = (Parameter) o;
+        return Objects.equals(name, parameter.name)
+                && Objects.equals(value, parameter.value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, value);
+    }
+
+    /**
+     * The parameter render mode.
+     *
+     * @author baev (Dmitry Baev)
+     * @since 2.15
+     */
+    public enum Mode {
+
+        /**
+         * Completely hide parameter from report.
+         */
+        HIDDEN,
+
+        /**
+         * Display parameter, but mask it's value.
+         */
+        MASKED,
+
+        /**
+         * Default mode. Displays both parameter name and value.
+         */
+        DEFAULT
+
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Stage.java b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
index 34a22513f..ff08a6149 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Stage.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,17 +15,33 @@
  */
 package io.qameta.allure.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
-
 /**
  * Test stages.
+ *
+ * @author baev (Dmitry Baev)
+ * @since 2.0
  */
 public enum Stage {
 
+    /**
+     * Scheduled stage.
+     */
     SCHEDULED("scheduled"),
+    /**
+     * Running stage.
+     */
     RUNNING("running"),
+    /**
+     * Finished stage.
+     */
     FINISHED("finished"),
+    /**
+     * Pending stage.
+     */
     PENDING("pending"),
+    /**
+     * Interrupted stage.
+     */
     INTERRUPTED("interrupted");
 
     private final String value;
@@ -34,13 +50,14 @@ public enum Stage {
         value = v;
     }
 
-    @JsonValue
-    public String value() {
-        return value;
-    }
-
+    /**
+     * From value stage.
+     *
+     * @param v the v
+     * @return the stage
+     */
     public static Stage fromValue(final String v) {
-        for (Stage c : Stage.values()) {
+        for (Stage c : values()) {
             if (c.value.equals(v)) {
                 return c;
             }
@@ -48,4 +65,13 @@ public static Stage fromValue(final String v) {
         throw new IllegalArgumentException(v);
     }
 
+    /**
+     * Value string.
+     *
+     * @return the string
+     */
+    public String value() {
+        return value;
+    }
+
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StageDeserializer.java b/allure-model/src/main/java/io/qameta/allure/model/StageDeserializer.java
deleted file mode 100644
index 29a9c8b4e..000000000
--- a/allure-model/src/main/java/io/qameta/allure/model/StageDeserializer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.model;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-import java.io.IOException;
-import java.util.stream.Stream;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class StageDeserializer extends StdDeserializer<Stage> {
-    protected StageDeserializer() {
-        super(Stage.class);
-    }
-
-    @Override
-    public Stage deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
-        final String value = p.readValueAs(String.class);
-        return Stream.of(Stage.values())
-                .filter(status -> status.value().equalsIgnoreCase(value))
-                .findAny()
-                .orElse(null);
-    }
-}
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Status.java b/allure-model/src/main/java/io/qameta/allure/model/Status.java
index fd6e31fa0..37ed668f2 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Status.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Status.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,16 +15,30 @@
  */
 package io.qameta.allure.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
-
 /**
  * Test statuses.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithStatus
+ * @since 2.0
  */
 public enum Status {
 
+    /**
+     * Marks tests that have some failed checks (assertions).
+     */
     FAILED("failed"),
+    /**
+     * Marks tests with unexpected failures during test execution.
+     */
     BROKEN("broken"),
+    /**
+     * Marks passed tests.
+     */
     PASSED("passed"),
+    /**
+     * Marks skipped/interrupted tests.
+     */
     SKIPPED("skipped");
 
     private final String value;
@@ -33,13 +47,14 @@ public enum Status {
         value = v;
     }
 
-    @JsonValue
-    public String value() {
-        return value;
-    }
-
+    /**
+     * From value status.
+     *
+     * @param v the v
+     * @return the status
+     */
     public static Status fromValue(final String v) {
-        for (Status c : Status.values()) {
+        for (Status c : values()) {
             if (c.value.equals(v)) {
                 return c;
             }
@@ -47,4 +62,13 @@ public static Status fromValue(final String v) {
         throw new IllegalArgumentException(v);
     }
 
+    /**
+     * Value string.
+     *
+     * @return the string
+     */
+    public String value() {
+        return value;
+    }
+
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StatusDeserializer.java b/allure-model/src/main/java/io/qameta/allure/model/StatusDeserializer.java
deleted file mode 100644
index 5b3508db2..000000000
--- a/allure-model/src/main/java/io/qameta/allure/model/StatusDeserializer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.model;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-import java.io.IOException;
-import java.util.stream.Stream;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class StatusDeserializer extends StdDeserializer<Status> {
-    protected StatusDeserializer() {
-        super(Status.class);
-    }
-
-    @Override
-    public Status deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
-        final String value = p.readValueAs(String.class);
-        return Stream.of(Status.values())
-                .filter(status -> status.value().equalsIgnoreCase(value))
-                .findAny()
-                .orElse(null);
-    }
-}
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
index 855a639f4..92e5449e5 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,33 +16,39 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores status details.
+ * The type Status details.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithStatusDetails
+ * @since 2.0
  */
 public class StatusDetails implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected boolean known;
-
-    protected boolean muted;
-
-    protected boolean flaky;
-
-    protected String message;
-
-    protected String trace;
+    private boolean known;
+    private boolean muted;
+    private boolean flaky;
+    private String message;
+    private String trace;
 
     /**
-     * Gets the value of the known property.
+     * Is known boolean.
+     *
+     * @return the boolean
      */
     public boolean isKnown() {
         return known;
     }
 
     /**
-     * Sets the value of the known property.
+     * Sets known.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setKnown(final boolean value) {
         this.known = value;
@@ -50,14 +56,19 @@ public StatusDetails setKnown(final boolean value) {
     }
 
     /**
-     * Gets the value of the muted property.
+     * Is muted boolean.
+     *
+     * @return the boolean
      */
     public boolean isMuted() {
         return muted;
     }
 
     /**
-     * Sets the value of the muted property.
+     * Sets muted.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setMuted(final boolean value) {
         this.muted = value;
@@ -65,14 +76,19 @@ public StatusDetails setMuted(final boolean value) {
     }
 
     /**
-     * Gets the value of the flaky property.
+     * Is flaky boolean.
+     *
+     * @return the boolean
      */
     public boolean isFlaky() {
         return flaky;
     }
 
     /**
-     * Sets the value of the flaky property.
+     * Sets flaky.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setFlaky(final boolean value) {
         this.flaky = value;
@@ -80,20 +96,19 @@ public StatusDetails setFlaky(final boolean value) {
     }
 
     /**
-     * Gets the value of the message property.
+     * Gets message.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the message
      */
     public String getMessage() {
         return message;
     }
 
     /**
-     * Sets the value of the message property.
+     * Sets message.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setMessage(final String value) {
         this.message = value;
@@ -101,20 +116,19 @@ public StatusDetails setMessage(final String value) {
     }
 
     /**
-     * Gets the value of the trace property.
+     * Gets trace.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the trace
      */
     public String getTrace() {
         return trace;
     }
 
     /**
-     * Sets the value of the trace property.
+     * Sets trace.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setTrace(final String value) {
         this.trace = value;
@@ -122,42 +136,26 @@ public StatusDetails setTrace(final String value) {
     }
 
     /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public StatusDetails withKnown(final boolean value) {
-        return setKnown(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public StatusDetails withMuted(final boolean value) {
-        return setMuted(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public StatusDetails withFlaky(final boolean value) {
-        return setFlaky(value);
-    }
-
-    /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public StatusDetails withMessage(final String value) {
-        return setMessage(value);
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final StatusDetails that = (StatusDetails) o;
+        return Objects.equals(message, that.message)
+                && Objects.equals(trace, that.trace);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public StatusDetails withTrace(final String value) {
-        return setTrace(value);
+    @Override
+    public int hashCode() {
+        return Objects.hash(message, trace);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StepResult.java b/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
index b114c0bbc..92de00ecf 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,305 +16,284 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 /**
- * POJO that stores step information.
+ * The model object that stores information about test steps that was run.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.ExecutableItem
+ * @see io.qameta.allure.model.WithAttachments
+ * @see io.qameta.allure.model.WithParameters
+ * @see io.qameta.allure.model.WithStatus
+ * @see io.qameta.allure.model.WithStatusDetails
+ * @see io.qameta.allure.model.WithSteps
+ * @since 2.0
  */
-@SuppressWarnings("deprecation")
-public class StepResult extends ExecutableItem implements Serializable {
+public class StepResult implements Serializable, ExecutableItem {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public StepResult setName(final String value) {
-        super.setName(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStatus(final Status value) {
-        super.setStatus(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStatusDetails(final StatusDetails value) {
-        super.setStatusDetails(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStage(final Stage value) {
-        super.setStage(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setDescription(final String value) {
-        super.setDescription(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setDescriptionHtml(final String value) {
-        super.setDescriptionHtml(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStart(final Long value) {
-        super.setStart(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStop(final Long value) {
-        super.setStop(value);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public StepResult setSteps(final List<StepResult> steps) {
-        super.setSteps(steps);
-        return this;
-    }
+    private String name;
+    private Status status;
+    private StatusDetails statusDetails;
+    private Stage stage;
+    private String description;
+    private String descriptionHtml;
+    private List<StepResult> steps = new ArrayList<>();
+    private List<Attachment> attachments = new ArrayList<>();
+    private List<Parameter> parameters = new ArrayList<>();
+    private Long start;
+    private Long stop;
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Gets name.
+     *
+     * @return the name
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setSteps(final StepResult... values) {
-        super.setSteps(values);
-        return this;
+    public String getName() {
+        return name;
     }
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setSteps(final Collection<StepResult> values) {
-        super.setSteps(values);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public StepResult setAttachments(final List<Attachment> attachments) {
-        super.setAttachments(attachments);
+    public StepResult setName(final String value) {
+        this.name = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Gets status.
+     *
+     * @return the status
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public StepResult setAttachments(final Attachment... values) {
-        super.setAttachments(values);
-        return this;
+    public Status getStatus() {
+        return status;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Sets status.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setAttachments(final Collection<Attachment> values) {
-        super.setAttachments(values);
+    public StepResult setStatus(final Status value) {
+        this.status = value;
         return this;
     }
 
+    /**
+     * Gets status details.
+     *
+     * @return the status details
+     */
     @Override
-    @JsonProperty
-    public StepResult setParameters(final List<Parameter> parameters) {
-        super.setParameters(parameters);
-        return this;
+    public StatusDetails getStatusDetails() {
+        return statusDetails;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Sets status details.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setParameters(final Parameter... values) {
-        super.setParameters(values);
+    public StepResult setStatusDetails(final StatusDetails value) {
+        this.statusDetails = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Gets stage.
+     *
+     * @return the stage
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setParameters(final Collection<Parameter> values) {
-        super.setParameters(values);
-        return this;
+    public Stage getStage() {
+        return stage;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stage.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withName(final String value) {
-        return setName(value);
+    public StepResult setStage(final Stage value) {
+        this.stage = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description.
+     *
+     * @return the description
      */
-    @Deprecated
-    @Override
-    public StepResult withStatus(final Status value) {
-        return setStatus(value);
+    public String getDescription() {
+        return description;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
+    public StepResult setDescription(final String value) {
+        this.description = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description html.
+     *
+     * @return the description html
      */
-    @Deprecated
-    @Override
-    public StepResult withStage(final Stage value) {
-        return setStage(value);
+    public String getDescriptionHtml() {
+        return descriptionHtml;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description html.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withDescription(final String value) {
-        return setDescription(value);
+    public StepResult setDescriptionHtml(final String value) {
+        this.descriptionHtml = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets steps.
+     *
+     * @return the steps
      */
-    @Deprecated
     @Override
-    public StepResult withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
+    public List<StepResult> getSteps() {
+        return steps;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets steps.
+     *
+     * @param steps the steps
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withStart(final Long value) {
-        return setStart(value);
+    public StepResult setSteps(final List<StepResult> steps) {
+        this.steps = steps;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets attachments.
+     *
+     * @return the attachments
      */
-    @Deprecated
     @Override
-    public StepResult withStop(final Long value) {
-        return setStop(value);
+    public List<Attachment> getAttachments() {
+        return attachments;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets attachments.
+     *
+     * @param attachments the attachments
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withSteps(final StepResult... values) {
-        return setSteps(values);
+    public StepResult setAttachments(final List<Attachment> attachments) {
+        this.attachments = attachments;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets parameters.
+     *
+     * @return the parameters
      */
-    @Deprecated
     @Override
-    public StepResult withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
+    public List<Parameter> getParameters() {
+        return parameters;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets parameters.
+     *
+     * @param parameters the parameters
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
+    public StepResult setParameters(final List<Parameter> parameters) {
+        this.parameters = parameters;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets start.
+     *
+     * @return the start
      */
-    @Deprecated
-    @Override
-    public StepResult withAttachments(final Attachment... values) {
-        return setAttachments(values);
+    public Long getStart() {
+        return start;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets start.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
+    public StepResult setStart(final Long value) {
+        this.start = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets stop.
+     *
+     * @return the stop
      */
-    @Deprecated
-    @Override
-    public StepResult withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
+    public Long getStop() {
+        return stop;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stop.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withParameters(final Parameter... values) {
-        return setParameters(values);
+    public StepResult setStop(final Long value) {
+        this.stop = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public StepResult withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final StepResult that = (StepResult) o;
+        return Objects.equals(name, that.name)
+                && status == that.status;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public StepResult withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
+    public int hashCode() {
+        return Objects.hash(name, status);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
index 438af01ba..ac5688a43 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,49 +17,60 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 /**
- * POJO that stores test result information.
+ * The model object that stores information about test that was run.
+ * Test results are the main entity of Allure.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.ExecutableItem
+ * @see io.qameta.allure.model.WithAttachments
+ * @see io.qameta.allure.model.WithLinks
+ * @see io.qameta.allure.model.WithParameters
+ * @see io.qameta.allure.model.WithStatus
+ * @see io.qameta.allure.model.WithStatusDetails
+ * @see io.qameta.allure.model.WithSteps
+ * @since 2.0
  */
-@SuppressWarnings({"PMD.TooManyMethods", "PMD.ExcessivePublicCount", "deprecation"})
-public class TestResult extends ExecutableItem implements Serializable, WithLinks {
+public class TestResult implements Serializable, ExecutableItem, WithLinks {
 
     private static final long serialVersionUID = 1L;
 
-    protected String uuid;
-
-    protected String historyId;
-
-    protected String testCaseId;
-
-    protected String rerunOf;
-
-    protected String fullName;
-
-    protected List<Label> labels;
-
-    protected List<Link> links;
-
-    /**
-     * Gets the value of the uuid property.
+    private String uuid;
+    private String historyId;
+    private String testCaseId;
+    private String testCaseName;
+    private String fullName;
+    private List<Label> labels = new ArrayList<>();
+    private List<Link> links = new ArrayList<>();
+    private String name;
+    private Status status;
+    private StatusDetails statusDetails;
+    private Stage stage;
+    private String description;
+    private String descriptionHtml;
+    private List<StepResult> steps = new ArrayList<>();
+    private List<Attachment> attachments = new ArrayList<>();
+    private List<Parameter> parameters = new ArrayList<>();
+    private Long start;
+    private Long stop;
+
+    /**
+     * Gets uuid.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the uuid
      */
     public String getUuid() {
         return uuid;
     }
 
     /**
-     * Sets the value of the uuid property.
+     * Sets uuid.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setUuid(final String value) {
         this.uuid = value;
@@ -67,20 +78,19 @@ public TestResult setUuid(final String value) {
     }
 
     /**
-     * Gets the value of the historyId property.
+     * Gets history id.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the history id
      */
     public String getHistoryId() {
         return historyId;
     }
 
     /**
-     * Sets the value of the historyId property.
+     * Sets history id.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setHistoryId(final String value) {
         this.historyId = value;
@@ -88,20 +98,19 @@ public TestResult setHistoryId(final String value) {
     }
 
     /**
-     * Gets the value of the testCaseId property.
+     * Gets test case id.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the test case id
      */
     public String getTestCaseId() {
         return testCaseId;
     }
 
     /**
-     * Sets the value of the testCaseId property.
+     * Sets test case id.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setTestCaseId(final String value) {
         this.testCaseId = value;
@@ -109,500 +118,340 @@ public TestResult setTestCaseId(final String value) {
     }
 
     /**
-     * Gets the value of the rerunOf property.
+     * Gets test case name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the test case name
      */
-    public String getRerunOf() {
-        return rerunOf;
+    public String getTestCaseName() {
+        return testCaseName;
     }
 
     /**
-     * Sets the value of the rerunOf property.
+     * Sets test case name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
-    public TestResult setRerunOf(final String value) {
-        this.rerunOf = value;
+    public TestResult setTestCaseName(final String value) {
+        this.testCaseName = value;
         return this;
     }
 
     /**
-     * Gets the value of the fullName property.
+     * Gets full name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the full name
      */
     public String getFullName() {
         return fullName;
     }
 
     /**
-     * Sets the value of the fullName property.
+     * Sets full name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setFullName(final String value) {
         this.fullName = value;
         return this;
     }
 
+    /**
+     * Gets labels.
+     *
+     * @return the labels
+     */
     public List<Label> getLabels() {
-        if (labels == null) {
-            labels = new ArrayList<>();
-        }
         return labels;
     }
 
-    @JsonProperty
+    /**
+     * Sets labels.
+     *
+     * @param labels the labels
+     * @return self for method chaining.
+     */
     public TestResult setLabels(final List<Label> labels) {
         this.labels = labels;
         return this;
     }
 
-    /**
-     * @deprecated use {@link #getLabels()} ()} and {@link Collection#addAll(Collection)} instead.
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLabels(final Label... values) {
-        if (values != null) {
-            for (Label value : values) {
-                getLabels().add(value);
-            }
-        }
-        return this;
-    }
 
     /**
-     * @deprecated use {@link #getLabels()} ()} and {@link Collection#addAll(Collection)} instead.
+     * Gets links.
+     *
+     * @return the links
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLabels(final Collection<Label> values) {
-        if (values != null) {
-            getLabels().addAll(values);
-        }
-        return this;
-    }
-
     @Override
     public List<Link> getLinks() {
-        if (links == null) {
-            links = new ArrayList<>();
-        }
         return links;
     }
 
-    @JsonProperty
+    /**
+     * Sets links.
+     *
+     * @param links the links
+     * @return self for method chaining.
+     */
     public TestResult setLinks(final List<Link> links) {
         this.links = links;
         return this;
     }
 
     /**
-     * @deprecated use {@link #getLinks()} and {@link Collection#addAll(Collection)} instead.
+     * Gets name.
+     *
+     * @return the name
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLinks(final Link... values) {
-        if (values != null) {
-            for (Link value : values) {
-                getLinks().add(value);
-            }
-        }
-        return this;
+    public String getName() {
+        return name;
     }
 
     /**
-     * @deprecated use {@link #getLinks()} and {@link Collection#addAll(Collection)} instead.
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLinks(final Collection<Link> values) {
-        if (values != null) {
-            getLinks().addAll(values);
-        }
-        return this;
-    }
-
-    @Override
     public TestResult setName(final String value) {
-        super.setName(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStatus(final Status value) {
-        super.setStatus(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStatusDetails(final StatusDetails value) {
-        super.setStatusDetails(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStage(final Stage value) {
-        super.setStage(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setDescription(final String value) {
-        super.setDescription(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setDescriptionHtml(final String value) {
-        super.setDescriptionHtml(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStart(final Long value) {
-        super.setStart(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStop(final Long value) {
-        super.setStop(value);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public TestResult setSteps(final List<StepResult> steps) {
-        super.setSteps(steps);
+        this.name = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #getSteps()} and {@link Collection#addAll(Collection)} instead.
+     * Gets status.
+     *
+     * @return the status
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public TestResult setSteps(final StepResult... values) {
-        super.setSteps(values);
-        return this;
+    public Status getStatus() {
+        return status;
     }
 
     /**
-     * @deprecated use {@link #getSteps()} and {@link Collection#addAll(Collection)} instead.
+     * Sets status.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setSteps(final Collection<StepResult> values) {
-        super.setSteps(values);
+    public TestResult setStatus(final Status value) {
+        this.status = value;
         return this;
     }
 
-    @Override
-    @JsonProperty
-    public TestResult setAttachments(final List<Attachment> attachments) {
-        super.setAttachments(attachments);
-        return this;
-    }
 
     /**
-     * @deprecated use {@link #getAttachments()} and {@link Collection#addAll(Collection)} instead.
+     * Gets status details.
+     *
+     * @return the status details
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public TestResult setAttachments(final Attachment... values) {
-        super.setAttachments(values);
-        return this;
+    public StatusDetails getStatusDetails() {
+        return statusDetails;
     }
 
     /**
-     * @deprecated use {@link #getAttachments()} and {@link Collection#addAll(Collection)} instead.
+     * Sets status details.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setAttachments(final Collection<Attachment> values) {
-        super.setAttachments(values);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public TestResult setParameters(final List<Parameter> parameters) {
-        super.setParameters(parameters);
+    public TestResult setStatusDetails(final StatusDetails value) {
+        this.statusDetails = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #getParameters()} and {@link Collection#addAll(Collection)} instead.
+     * Gets stage.
+     *
+     * @return the stage
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setParameters(final Parameter... values) {
-        super.setParameters(values);
-        return this;
+    public Stage getStage() {
+        return stage;
     }
 
     /**
-     * @deprecated use {@link #getParameters()} and {@link Collection#addAll(Collection)} instead.
+     * Sets stage.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setParameters(final Collection<Parameter> values) {
-        super.setParameters(values);
+    public TestResult setStage(final Stage value) {
+        this.stage = value;
         return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withUuid(final String value) {
-        return setUuid(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withHistoryId(final String value) {
-        return setHistoryId(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withTestCaseId(final String value) {
-        return setTestCaseId(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withRerunOf(final String value) {
-        return setRerunOf(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withFullName(final String value) {
-        return setFullName(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLabels(final Label... values) {
-        return setLabels(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLabels(final Collection<Label> values) {
-        return setLabels(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLabels(final List<Label> labels) {
-        return setLabels(labels);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLinks(final Link... values) {
-        return setLinks(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description.
+     *
+     * @return the description
      */
-    @Deprecated
-    public TestResult withLinks(final Collection<Link> values) {
-        return setLinks(values);
+    public String getDescription() {
+        return description;
     }
 
     /**
-     * @deprecated use set method
+     * Sets description.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    public TestResult withLinks(final List<Link> links) {
-        return setLinks(links);
+    public TestResult setDescription(final String value) {
+        this.description = value;
+        return this;
     }
 
-
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description html.
+     *
+     * @return the description html
      */
-    @Deprecated
-    @Override
-    public TestResult withName(final String value) {
-        return setName(value);
+    public String getDescriptionHtml() {
+        return descriptionHtml;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description html.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withStatus(final Status value) {
-        return setStatus(value);
+    public TestResult setDescriptionHtml(final String value) {
+        this.descriptionHtml = value;
+        return this;
     }
 
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    @Override
-    public TestResult withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
-    }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets steps.
+     *
+     * @return the steps
      */
-    @Deprecated
     @Override
-    public TestResult withStage(final Stage value) {
-        return setStage(value);
+    public List<StepResult> getSteps() {
+        return steps;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets steps.
+     *
+     * @param steps the steps
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withDescription(final String value) {
-        return setDescription(value);
+    public TestResult setSteps(final List<StepResult> steps) {
+        this.steps = steps;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets attachments.
+     *
+     * @return the attachments
      */
-    @Deprecated
     @Override
-    public TestResult withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
+    public List<Attachment> getAttachments() {
+        return attachments;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets attachments.
+     *
+     * @param attachments the attachments
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withStart(final Long value) {
-        return setStart(value);
+    public TestResult setAttachments(final List<Attachment> attachments) {
+        this.attachments = attachments;
+        return this;
     }
 
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    @Override
-    public TestResult withStop(final Long value) {
-        return setStop(value);
-    }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets parameters.
+     *
+     * @return the parameters
      */
-    @Deprecated
     @Override
-    public TestResult withSteps(final StepResult... values) {
-        return setSteps(values);
+    public List<Parameter> getParameters() {
+        return parameters;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets parameters.
+     *
+     * @param parameters the parameters
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
+    public TestResult setParameters(final List<Parameter> parameters) {
+        this.parameters = parameters;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets start.
+     *
+     * @return the start
      */
-    @Deprecated
-    @Override
-    public TestResult withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
+    public Long getStart() {
+        return start;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets start.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withAttachments(final Attachment... values) {
-        return setAttachments(values);
+    public TestResult setStart(final Long value) {
+        this.start = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets stop.
+     *
+     * @return the stop
      */
-    @Deprecated
-    @Override
-    public TestResult withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
+    public Long getStop() {
+        return stop;
     }
 
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    @Override
-    public TestResult withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
-    }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stop.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withParameters(final Parameter... values) {
-        return setParameters(values);
+    public TestResult setStop(final Long value) {
+        this.stop = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public TestResult withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final TestResult that = (TestResult) o;
+        return Objects.equals(uuid, that.uuid)
+                && Objects.equals(historyId, that.historyId)
+                && Objects.equals(testCaseId, that.testCaseId)
+                && Objects.equals(fullName, that.fullName)
+                && Objects.equals(name, that.name);
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public TestResult withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
+    public int hashCode() {
+        return Objects.hash(uuid, historyId, testCaseId, fullName, name);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
index 9546d9c43..b4645051d 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,57 +15,53 @@
  */
 package io.qameta.allure.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 /**
- * POJO that stores information about test fixtures.
+ * The model object that stores links between test results and test fixtures.
+ * <p>
+ * During report generation all {@link #befores} and {@link #afters} is added to each
+ * test result that {@link TestResult#getUuid()} matches values, specified in {@link #children}.
+ * <p>
+ * Containers that have empty {@link #children} are simply ignored.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @see io.qameta.allure.model.WithLinks
+ * @since 2.0
  */
-@SuppressWarnings("PMD.ExcessivePublicCount")
 public class TestResultContainer implements Serializable, WithLinks {
 
     private static final long serialVersionUID = 1L;
 
-    protected String uuid;
-
-    protected String name;
-
-    protected List<String> children;
-
-    protected String description;
-
-    protected String descriptionHtml;
-
-    protected List<FixtureResult> befores;
-
-    protected List<FixtureResult> afters;
-
-    protected List<Link> links;
-
-    protected Long start;
-
-    protected Long stop;
+    private String uuid;
+    private String name;
+    private List<String> children = new ArrayList<>();
+    private String description;
+    private String descriptionHtml;
+    private List<FixtureResult> befores = new ArrayList<>();
+    private List<FixtureResult> afters = new ArrayList<>();
+    private List<Link> links;
+    private Long start;
+    private Long stop;
 
     /**
-     * Gets the value of the uuid property.
+     * Gets uuid.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the uuid
      */
     public String getUuid() {
         return uuid;
     }
 
     /**
-     * Sets the value of the uuid property.
+     * Sets uuid.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setUuid(final String value) {
         this.uuid = value;
@@ -73,20 +69,19 @@ public TestResultContainer setUuid(final String value) {
     }
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setName(final String value) {
         this.name = value;
@@ -94,20 +89,19 @@ public TestResultContainer setName(final String value) {
     }
 
     /**
-     * Gets the value of the description property.
+     * Gets description.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the description
      */
     public String getDescription() {
         return description;
     }
 
     /**
-     * Sets the value of the description property.
+     * Sets description.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setDescription(final String value) {
         this.description = value;
@@ -115,20 +109,19 @@ public TestResultContainer setDescription(final String value) {
     }
 
     /**
-     * Gets the value of the descriptionHtml property.
+     * Gets description html.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the description html
      */
     public String getDescriptionHtml() {
         return descriptionHtml;
     }
 
     /**
-     * Sets the value of the descriptionHtml property.
+     * Sets description html.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setDescriptionHtml(final String value) {
         this.descriptionHtml = value;
@@ -136,20 +129,19 @@ public TestResultContainer setDescriptionHtml(final String value) {
     }
 
     /**
-     * Gets the value of the start property.
+     * Gets start.
      *
-     * @return possible object is
-     * {@link Long }
+     * @return the start
      */
     public Long getStart() {
         return start;
     }
 
     /**
-     * Sets the value of the start property.
+     * Sets start.
      *
-     * @param value allowed object is
-     *              {@link Long }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setStart(final Long value) {
         this.start = value;
@@ -157,342 +149,126 @@ public TestResultContainer setStart(final Long value) {
     }
 
     /**
-     * Gets the value of the stop property.
+     * Gets stop.
      *
-     * @return possible object is
-     * {@link Long }
+     * @return the stop
      */
     public Long getStop() {
         return stop;
     }
 
     /**
-     * Sets the value of the stop property.
+     * Sets stop.
      *
-     * @param value allowed object is
-     *              {@link Long }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setStop(final Long value) {
         this.stop = value;
         return this;
     }
 
+    /**
+     * Gets children.
+     *
+     * @return the children
+     */
     public List<String> getChildren() {
-        if (children == null) {
-            children = new ArrayList<>();
-        }
         return children;
     }
 
-    @JsonProperty
-    public TestResultContainer setChildren(final List<String> children) {
-        this.children = children;
-        return this;
-    }
-
     /**
-     * @deprecated use {@link #setChildren(List)} instead.
+     * Sets children.
+     *
+     * @param children the children
+     * @return self for method chaining
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setChildren(final String... values) {
-        if (values != null) {
-            for (String value : values) {
-                getChildren().add(value);
-            }
-        }
+    public TestResultContainer setChildren(final List<String> children) {
+        this.children = children;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setChildren(List)} instead.
+     * Gets befores.
+     *
+     * @return the befores
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setChildren(final Collection<String> values) {
-        if (values != null) {
-            getChildren().addAll(values);
-        }
-        return this;
-    }
-
     public List<FixtureResult> getBefores() {
-        if (befores == null) {
-            befores = new ArrayList<>();
-        }
         return befores;
     }
 
-    @JsonProperty
-    public TestResultContainer setBefores(final List<FixtureResult> befores) {
-        this.befores = befores;
-        return this;
-    }
-
     /**
-     * @deprecated use {@link #setBefores(List)} instead.
+     * Sets befores.
+     *
+     * @param befores the befores
+     * @return self for method chaining
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setBefores(final FixtureResult... values) {
-        if (values != null) {
-            for (FixtureResult value : values) {
-                getBefores().add(value);
-            }
-        }
+    public TestResultContainer setBefores(final List<FixtureResult> befores) {
+        this.befores = befores;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setBefores(List)} instead.
+     * Gets afters.
+     *
+     * @return the afters
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setBefores(final Collection<FixtureResult> values) {
-        if (values != null) {
-            getBefores().addAll(values);
-        }
-        return this;
-    }
-
     public List<FixtureResult> getAfters() {
-        if (afters == null) {
-            afters = new ArrayList<>();
-        }
         return afters;
     }
 
-    @JsonProperty
-    public TestResultContainer setAfters(final List<FixtureResult> afters) {
-        this.afters = afters;
-        return this;
-    }
-
     /**
-     * @deprecated use {@link #setAfters(List)} instead.
+     * Sets afters.
+     *
+     * @param afters the afters
+     * @return self for method chaining
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setAfters(final FixtureResult... values) {
-        if (values != null) {
-            for (FixtureResult value : values) {
-                getAfters().add(value);
-            }
-        }
+    public TestResultContainer setAfters(final List<FixtureResult> afters) {
+        this.afters = afters;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setAfters(List)} instead.
+     * Gets links.
+     *
+     * @return the links
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setAfters(final Collection<FixtureResult> values) {
-        if (values != null) {
-            getAfters().addAll(values);
-        }
-        return this;
-    }
-
     @Override
     public List<Link> getLinks() {
-        if (links == null) {
-            links = new ArrayList<>();
-        }
         return links;
     }
 
-    @JsonProperty
+    /**
+     * Sets links.
+     *
+     * @param links the links
+     * @return self for method chaining
+     */
     public TestResultContainer setLinks(final List<Link> links) {
         this.links = links;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setLinks(List)} instead.
+     * {@inheritDoc}
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setLinks(final Link... values) {
-        if (values != null) {
-            for (Link value : values) {
-                getLinks().add(value);
-            }
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
         }
-        return this;
-    }
-
-    /**
-     * @deprecated use {@link #setLinks(List)} instead.
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setLinks(final Collection<Link> values) {
-        if (values != null) {
-            getLinks().addAll(values);
+        if (o == null || getClass() != o.getClass()) {
+            return false;
         }
-        return this;
+        final TestResultContainer that = (TestResultContainer) o;
+        return Objects.equals(uuid, that.uuid) && Objects.equals(name, that.name);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withUuid(final String value) {
-        return setUuid(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withName(final String value) {
-        return setName(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withDescription(final String value) {
-        return setDescription(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withStart(final Long value) {
-        return setStart(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withStop(final Long value) {
-        return setStop(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withChildren(final String... values) {
-        return setChildren(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withChildren(final Collection<String> values) {
-        return setChildren(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withChildren(final List<String> children) {
-        return setChildren(children);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withBefores(final FixtureResult... values) {
-        return setBefores(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withBefores(final Collection<FixtureResult> values) {
-        return setBefores(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withBefores(final List<FixtureResult> befores) {
-        return setBefores(befores);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withAfters(final FixtureResult... values) {
-        return setAfters(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withAfters(final Collection<FixtureResult> values) {
-        return setAfters(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withAfters(final List<FixtureResult> afters) {
-        return setAfters(afters);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withLinks(final Link... values) {
-        return setLinks(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withLinks(final Collection<Link> values) {
-        return setLinks(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withLinks(final List<Link> links) {
-        return setLinks(links);
+    @Override
+    public int hashCode() {
+        return Objects.hash(uuid, name);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestRunResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestRunResult.java
deleted file mode 100644
index 829ed4e74..000000000
--- a/allure-model/src/main/java/io/qameta/allure/model/TestRunResult.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.model;
-
-import java.io.Serializable;
-
-/**
- * POJO that stores information about test run.
- * @deprecated scheduled for removal in 3.0 release
- */
-@Deprecated
-public class TestRunResult implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    protected String uuid;
-
-    protected String name;
-
-    /**
-     * Gets the value of the uuid property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public TestRunResult setUuid(final String value) {
-        this.uuid = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public TestRunResult setName(final String value) {
-        this.name = value;
-        return this;
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public TestRunResult withUuid(final String value) {
-        return setUuid(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public TestRunResult withName(final String value) {
-        return setName(value);
-    }
-}
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
index ece54c8de..6b773b11e 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,11 +18,23 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev baev@qameta.io).
- * @since 1.0-BETA1
+ * The marker interface for model objects with attachments.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
+@FunctionalInterface
 public interface WithAttachments {
 
+    /**
+     * Gets attachments.
+     *
+     * @return the attachments
+     */
     List<Attachment> getAttachments();
 
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
index e0169bbd2..050518333 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,10 +18,23 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev).
+ * The marker interface for model objects with links.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
+@FunctionalInterface
 public interface WithLinks {
 
+    /**
+     * Gets links.
+     *
+     * @return the links
+     */
     List<Link> getLinks();
 
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
index a89b0bfc3..92f0be89d 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,11 +18,23 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev).
- * @since 1.0-BETA2
+ * The marker interface for model objects that could be parameterised.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
+@FunctionalInterface
 public interface WithParameters {
 
+    /**
+     * Gets parameters.
+     *
+     * @return the parameters
+     */
     List<Parameter> getParameters();
 
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
index c2e64e315..645e03fcb 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,10 +16,23 @@
 package io.qameta.allure.model;
 
 /**
- * @author charlie (Dmitry Baev).
+ * The marker interface for model objects with status.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
+@FunctionalInterface
 public interface WithStatus {
 
+    /**
+     * Gets status.
+     *
+     * @return the status
+     */
     Status getStatus();
 
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java b/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
index bca413090..08400c748 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,10 +16,23 @@
 package io.qameta.allure.model;
 
 /**
- * @author charlie (Dmitry Baev).
+ * The marker interface for model objects with status details.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @see WithStatus
+ * @since 2.0
  */
 public interface WithStatusDetails extends WithStatus {
 
+    /**
+     * Gets status details.
+     *
+     * @return the status details
+     */
     StatusDetails getStatusDetails();
 
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
index 71816082d..52caf387c 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,11 +18,23 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev).
- * @since 1.0-BETA1
+ * The marker interface for model objects with steps.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
+@FunctionalInterface
 public interface WithSteps {
 
+    /**
+     * Gets steps.
+     *
+     * @return the steps
+     */
     List<StepResult> getSteps();
 
 }
diff --git a/allure-okhttp/build.gradle.kts b/allure-okhttp/build.gradle.kts
index 2cd38e5f3..8d4bf1655 100644
--- a/allure-okhttp/build.gradle.kts
+++ b/allure-okhttp/build.gradle.kts
@@ -1,14 +1,12 @@
 description = "Allure OkHttp Integration"
 
-val agent: Configuration by configurations.creating
-
 val okhttpVersion = "2.7.5"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
-    implementation("com.squareup.okhttp:okhttp:$okhttpVersion")
+    compileOnly("com.squareup.okhttp:okhttp:$okhttpVersion")
     testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("com.squareup.okhttp:okhttp:$okhttpVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
@@ -29,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
index 781927cf5..b8f72ad76 100644
--- a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
+++ b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,17 +15,18 @@
  */
 package io.qameta.allure.okhttp;
 
+import com.squareup.okhttp.Interceptor;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.Response;
+import com.squareup.okhttp.ResponseBody;
 import io.qameta.allure.attachment.AttachmentData;
 import io.qameta.allure.attachment.AttachmentProcessor;
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
 import io.qameta.allure.attachment.http.HttpResponseAttachment;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.ResponseBody;
+import okio.Buffer;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -33,7 +34,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import okio.Buffer;
 
 /**
  * Allure interceptor logger for OkHttp.
@@ -71,6 +71,7 @@ public AllureOkHttp withResponseTemplate(final String templatePath) {
         return setResponseTemplate(templatePath);
     }
 
+    @SuppressWarnings("PMD.CloseResource")
     @Override
     public Response intercept(final Chain chain) throws IOException {
         final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
@@ -118,8 +119,9 @@ private static Map<String, String> toMapConverter(final Map<String, List<String>
     }
 
     private static String readRequestBody(final RequestBody requestBody) throws IOException {
-        final Buffer buffer = new Buffer();
-        requestBody.writeTo(buffer);
-        return buffer.readString(StandardCharsets.UTF_8);
+        try (Buffer buffer = new Buffer()) {
+            requestBody.writeTo(buffer);
+            return buffer.readString(StandardCharsets.UTF_8);
+        }
     }
 }
diff --git a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
index 15e39c6fe..4a6c9dc3f 100644
--- a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
+++ b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp3/build.gradle.kts b/allure-okhttp3/build.gradle.kts
index fcc64fe82..6a1558f48 100644
--- a/allure-okhttp3/build.gradle.kts
+++ b/allure-okhttp3/build.gradle.kts
@@ -1,14 +1,12 @@
 description = "Allure OkHttp3 Integration"
 
-val agent: Configuration by configurations.creating
-
-val okhttpVersion = "3.13.1"
+val okhttpVersion = "4.12.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
-    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
+    compileOnly("com.squareup.okhttp3:okhttp:$okhttpVersion")
     testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
@@ -29,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
index e47a956bd..6cdfcc226 100644
--- a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
+++ b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -71,6 +71,7 @@ public AllureOkHttp3 withResponseTemplate(final String templatePath) {
         return setResponseTemplate(templatePath);
     }
 
+    @SuppressWarnings("PMD.CloseResource")
     @Override
     public Response intercept(final Chain chain) throws IOException {
         final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
@@ -118,8 +119,9 @@ private static Map<String, String> toMapConverter(final Map<String, List<String>
     }
 
     private static String readRequestBody(final RequestBody requestBody) throws IOException {
-        final Buffer buffer = new Buffer();
-        requestBody.writeTo(buffer);
-        return buffer.readString(StandardCharsets.UTF_8);
+        try (Buffer buffer = new Buffer()) {
+            requestBody.writeTo(buffer);
+            return buffer.readString(StandardCharsets.UTF_8);
+        }
     }
 }
diff --git a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
index 3d0adc6c1..b2a8630f4 100644
--- a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
+++ b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/build.gradle.kts b/allure-reader/build.gradle.kts
new file mode 100644
index 000000000..432fd8158
--- /dev/null
+++ b/allure-reader/build.gradle.kts
@@ -0,0 +1,23 @@
+description = "Allure Model Reader Module"
+
+dependencies {
+    api(project(":allure-model"))
+    implementation("com.fasterxml.jackson.core:jackson-databind")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.reader"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
new file mode 100644
index 000000000..9a9861826
--- /dev/null
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.reader;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+/**
+ * @param <T> the enum's type
+ * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ */
+@Deprecated
+/* package-private */ abstract class AllureEnumDeserializer<T extends Enum<T>> extends StdDeserializer<T> {
+
+    private final Class<T> type;
+
+    protected AllureEnumDeserializer(final Class<T> vc) {
+        super(vc);
+        type = vc;
+    }
+
+    @Override
+    public T deserialize(final JsonParser p,
+                         final DeserializationContext ctxt) throws IOException {
+        final String value = p.readValueAs(String.class);
+        if (Objects.isNull(value)) {
+            return null;
+        }
+
+        final String trimmed = value.trim();
+        if (trimmed.isEmpty()) {
+            return null;
+        }
+
+        return Stream.of(type.getEnumConstants())
+                .filter(e -> e.name().equalsIgnoreCase(trimmed))
+                .findFirst()
+                .orElse(null);
+    }
+}
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
new file mode 100644
index 000000000..88fe9eccf
--- /dev/null
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.reader;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class AllureObjectMapperFactory {
+
+    private AllureObjectMapperFactory() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static ObjectMapper createMapper() {
+        return JsonMapper.builder()
+                .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
+                .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
+                .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
+                .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .disable(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES)
+                .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+                .disable(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)
+                .build();
+    }
+}
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
new file mode 100644
index 000000000..f048e72e1
--- /dev/null
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
@@ -0,0 +1,30 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.reader;
+
+import io.qameta.allure.model.Parameter;
+
+/**
+ * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ */
+@Deprecated
+public class ParameterModeDeserializer extends AllureEnumDeserializer<Parameter.Mode> {
+    public ParameterModeDeserializer() {
+        super(Parameter.Mode.class);
+    }
+}
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
new file mode 100644
index 000000000..8b6ddb62a
--- /dev/null
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
@@ -0,0 +1,30 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.reader;
+
+import io.qameta.allure.model.Stage;
+
+/**
+ * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ */
+@Deprecated
+public class StageDeserializer extends AllureEnumDeserializer<Stage> {
+    public StageDeserializer() {
+        super(Stage.class);
+    }
+}
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
new file mode 100644
index 000000000..f7824aa0e
--- /dev/null
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
@@ -0,0 +1,30 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.reader;
+
+import io.qameta.allure.model.Status;
+
+/**
+ * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ */
+@Deprecated
+public class StatusDeserializer extends AllureEnumDeserializer<Status> {
+    public StatusDeserializer() {
+        super(Status.class);
+    }
+}
diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index 486282572..4834fa00a 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -1,14 +1,12 @@
 description = "Allure Rest-Assured Integration"
 
-val agent: Configuration by configurations.creating
-
-val restAssuredVersion = "4.0.0"
+val restAssuredVersion = "5.5.6"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
-    implementation("io.rest-assured:rest-assured:$restAssuredVersion")
+    compileOnly("io.rest-assured:rest-assured:$restAssuredVersion")
     testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("io.rest-assured:rest-assured:$restAssuredVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
@@ -30,7 +28,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index 717b64ecd..07f0d5e6c 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,19 +28,33 @@
 import io.restassured.specification.FilterableResponseSpecification;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
 
 import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
-import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
+import static java.util.Optional.ofNullable;
 
 /**
  * Allure logger filter for Rest-assured.
  */
 public class AllureRestAssured implements OrderedFilter {
 
+    private static final String HIDDEN_PLACEHOLDER = "[ BLACKLISTED ]";
+
+    private int maxAllowedPrettifyLength = 1_048_576;
+
     private String requestTemplatePath = "http-request.ftl";
     private String responseTemplatePath = "http-response.ftl";
+    private String requestAttachmentName = "Request";
+    private String responseAttachmentName;
+
+    public AllureRestAssured setMaxAllowedPrettifyLength(final int maxAllowedPrettifyLength) {
+        this.maxAllowedPrettifyLength = maxAllowedPrettifyLength;
+        return this;
+    }
 
     public AllureRestAssured setRequestTemplate(final String templatePath) {
         this.requestTemplatePath = templatePath;
@@ -52,6 +66,16 @@ public AllureRestAssured setResponseTemplate(final String templatePath) {
         return this;
     }
 
+    public AllureRestAssured setRequestAttachmentName(final String requestAttachmentName) {
+        this.requestAttachmentName = requestAttachmentName;
+        return this;
+    }
+
+    public AllureRestAssured setResponseAttachmentName(final String responseAttachmentName) {
+        this.responseAttachmentName = responseAttachmentName;
+        return this;
+    }
+
     /**
      * @deprecated use {@link #setRequestTemplate(String)} instead.
      * Scheduled for removal in 3.0 release.
@@ -75,17 +99,24 @@ public Response filter(final FilterableRequestSpecification requestSpec,
                            final FilterableResponseSpecification responseSpec,
                            final FilterContext filterContext) {
         final Prettifier prettifier = new Prettifier();
+        final String url = requestSpec.getURI();
 
+        final Set<String> hiddenHeaders = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        hiddenHeaders.addAll(Objects.requireNonNull(requestSpec.getConfig().getLogConfig().blacklistedHeaders()));
 
-        final HttpRequestAttachment.Builder requestAttachmentBuilder = create("Request", requestSpec.getURI())
+        final HttpRequestAttachment.Builder requestAttachmentBuilder = create(requestAttachmentName, url)
                 .setMethod(requestSpec.getMethod())
-                .setHeaders(toMapConverter(requestSpec.getHeaders()))
-                .setCookies(toMapConverter(requestSpec.getCookies()));
+                .setHeaders(toMapConverter(requestSpec.getHeaders(), hiddenHeaders))
+                .setCookies(toMapConverter(requestSpec.getCookies(), new HashSet<>()));
 
         if (Objects.nonNull(requestSpec.getBody())) {
             requestAttachmentBuilder.setBody(prettifier.getPrettifiedBodyIfPossible(requestSpec));
         }
 
+        if (Objects.nonNull(requestSpec.getFormParams())) {
+            requestAttachmentBuilder.setFormParams(requestSpec.getFormParams());
+        }
+
         final HttpRequestAttachment requestAttachment = requestAttachmentBuilder.build();
 
         new DefaultAttachmentProcessor().addAttachment(
@@ -94,10 +125,19 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         );
 
         final Response response = filterContext.next(requestSpec, responseSpec);
-        final HttpResponseAttachment responseAttachment = create(response.getStatusLine())
+
+        final String attachmentName = ofNullable(responseAttachmentName)
+                .orElse(response.getStatusLine());
+
+        final String responseAsString = response.getBody().asString();
+        final String body = responseAsString.length() > maxAllowedPrettifyLength
+                ? responseAsString
+                : prettifier.getPrettifiedBodyIfPossible(response, response.getBody());
+
+        final HttpResponseAttachment responseAttachment = HttpResponseAttachment.Builder.create(attachmentName)
                 .setResponseCode(response.getStatusCode())
-                .setHeaders(toMapConverter(response.getHeaders()))
-                .setBody(prettifier.getPrettifiedBodyIfPossible(response, response.getBody()))
+                .setHeaders(toMapConverter(response.getHeaders(), hiddenHeaders))
+                .setBody(body)
                 .build();
 
         new DefaultAttachmentProcessor().addAttachment(
@@ -108,9 +148,10 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         return response;
     }
 
-    private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items) {
+    private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items,
+                                                      final Set<String> toHide) {
         final Map<String, String> result = new HashMap<>();
-        items.forEach(h -> result.put(h.getName(), h.getValue()));
+        items.forEach(h -> result.put(h.getName(), toHide.contains(h.getName()) ? HIDDEN_PLACEHOLDER : h.getValue()));
         return result;
     }
 
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index ff7e38cf4..4b3b2092f 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.qameta.allure.restassured;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.google.common.collect.ImmutableList;
@@ -23,69 +24,229 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
 import io.restassured.RestAssured;
+import io.restassured.config.LogConfig;
+import io.restassured.config.RestAssuredConfig;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
 
 import java.util.Collection;
-import java.util.Objects;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+class AttachmentArgumentProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+
+        return Stream.of(
+                arguments(ImmutableList.of("Request", "HTTP/1.1 200 OK"), new AllureRestAssured()),
+                arguments(ImmutableList.of("Allure Request", "Allure Response"), new AllureRestAssured().setRequestAttachmentName("Allure Request").setResponseAttachmentName("Allure Response")),
+                arguments(ImmutableList.of("Request", "Allure Response"), new AllureRestAssured().setResponseAttachmentName("Allure Response")),
+                arguments(ImmutableList.of("Allure Request", "HTTP/1.1 200 OK"), new AllureRestAssured().setRequestAttachmentName("Allure Request"))
+        );
+    }
+}
+
+class JsonPrettifyingArgumentsProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+
+        return Stream.of(
+                arguments(new AllureRestAssured(), """
+                        {
+                            &quot;name&quot;: &quot;12345&quot;,
+                            &quot;value&quot;: &quot;abcdef&quot;
+                        }"""),
+                arguments(new AllureRestAssured().setMaxAllowedPrettifyLength(5), """
+                        {&quot;name&quot;:&quot;12345&quot;,&quot;value&quot;:&quot;abcdef&quot;}
+                        """)
+        );
+    }
+}
+
+class HiddenHeadersArgumentProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+
+        final String hiddenHeader = "Authorization";
+        final String header = "Accept";
+        final String headerValue = "value";
+
+        final Map<String, String> headers = Map.of(hiddenHeader, headerValue, header, headerValue);
+        final List<String> expectedHeaders = List.of(hiddenHeader + ": [ BLACKLISTED ]", header + ": " + headerValue);
+
+        return Stream.of(
+                arguments(headers, hiddenHeader, expectedHeaders, new AllureRestAssured()),
+                arguments(headers, hiddenHeader.toUpperCase(), expectedHeaders, new AllureRestAssured())
+        );
+    }
+}
 
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureRestAssuredTest {
 
-    static Stream<String> attachmentNameProvider() {
-        return Stream.of("Request", "HTTP/1.1 200 OK");
+    @ParameterizedTest
+    @ArgumentsSource(AttachmentArgumentProvider.class)
+    void shouldCreateAttachment(final List<String> attachmentNames, final AllureRestAssured filter) {
+        RestAssured.replaceFiltersWith(filter);
+        final AllureResults results = execute();
+
+        assertThat(results.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .map(Attachment::getName))
+                .containsExactlyElementsOf(attachmentNames);
+    }
+
+    @Test
+    void shouldProperlySetAttachmentNameForSingleFilterInstance() {
+        final AllureRestAssured filter = new AllureRestAssured();
+
+        final ResponseDefinitionBuilder responseBuilderOne = WireMock.aResponse()
+                .withStatus(200)
+                .withBody("some body");
+
+        final ResponseDefinitionBuilder responseBuilderTwo = WireMock.aResponse()
+                .withStatus(400)
+                .withBody("some other body");
+
+        RestAssured.replaceFiltersWith(filter);
+        final AllureResults resultsOne = executeWithStub(responseBuilderOne);
+
+        RestAssured.replaceFiltersWith(filter);
+        final AllureResults resultsTwo = executeWithStub(responseBuilderTwo);
+
+        assertThat(resultsOne.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .map(Attachment::getName))
+                .hasSize(2)
+                .anyMatch(res -> res.equals("HTTP/1.1 200 OK"));
+
+        assertThat(resultsTwo.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .map(Attachment::getName))
+                .hasSize(2)
+                .anyMatch(res -> res.equals("HTTP/1.1 400 Bad Request"));
     }
 
     @ParameterizedTest
-    @MethodSource(value = "attachmentNameProvider")
-    void shouldCreateAttachment(final String attachmentName) {
+    @ArgumentsSource(AttachmentArgumentProvider.class)
+    void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureRestAssured filter) {
+        RestAssured.replaceFiltersWith(filter);
         final AllureResults results = execute();
 
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .flatExtracting(Attachment::getName)
-                .contains(attachmentName);
+        List<Attachment> actualAttachments = results.getTestResults().stream()
+                .map(TestResult::getAttachments)
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
+
+        assertThat(actualAttachments)
+                .map(Attachment::getName)
+                .containsExactlyElementsOf(attachmentNames)
+                .doesNotContainNull();
+
+        assertThat(actualAttachments)
+                .map(Attachment::getSource)
+                .containsExactlyInAnyOrderElementsOf(results.getAttachments().keySet())
+                .doesNotContainNull();
     }
 
     @ParameterizedTest
-    @MethodSource(value = "attachmentNameProvider")
-    void shouldCatchAttachmentBody(final String attachmentName) {
-        final AllureResults results = execute();
+    @ArgumentsSource(HiddenHeadersArgumentProvider.class)
+    void shouldHideHeadersInAttachments(final Map<String, String> headers,
+                                        final String hiddenHeader,
+                                        final List<String> expectedValues,
+                                        final AllureRestAssured filter) {
+
+        final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse().withStatus(200);
+        headers.forEach(responseBuilder::withHeader);
+
+        RestAssured.config = new RestAssuredConfig().logConfig(LogConfig.logConfig().blacklistHeaders(List.of(hiddenHeader)));
+        RestAssured.replaceFiltersWith(filter);
 
-        final Attachment found = results.getTestResults().stream()
+        final AllureResults results = executeWithStub(responseBuilder, RestAssured.with().headers(headers));
+
+        assertThat(results.getAttachments().values())
+                .hasSize(2)
+                .map(at -> new String(at, StandardCharsets.UTF_8))
+                .allSatisfy(at -> expectedValues.forEach(ev -> assertThat(at).contains(ev)));
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(JsonPrettifyingArgumentsProvider.class)
+    void responseJsonPrettified(final AllureRestAssured filter, final String formattedBody) {
+        final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse()
+                .withHeader("Content-Type", "application/json")
+                .withBody("""
+                        {"name":"12345","value":"abcdef"}
+                        """)
+                .withStatus(200);
+
+        RestAssured.replaceFiltersWith(filter);
+
+        final AllureResults results = executeWithStub(responseBuilder, RestAssured.with());
+        final Attachment requestAttachment = results.getTestResults()
+                .stream()
                 .map(TestResult::getAttachments)
                 .flatMap(Collection::stream)
-                .filter(attachment -> Objects.equals(attachmentName, attachment.getName()))
+                .filter(attachment -> "HTTP/1.1 200 OK".equals(attachment.getName()))
                 .findAny()
-                .orElseThrow(() -> new RuntimeException("attachment not found"));
+                .orElseThrow(() -> new AssertionError("No response attachment found"));
 
-        assertThat(results.getAttachments())
-                .containsKeys(found.getSource());
+        final byte[] attachmentBody = results.getAttachments().get(requestAttachment.getSource());
+        final String attachmentBodyString = new String(attachmentBody, StandardCharsets.UTF_8);
+
+        assertThat(attachmentBodyString)
+                .contains(formattedBody);
     }
 
     protected final AllureResults execute() {
-        RestAssured.replaceFiltersWith(new AllureRestAssured());
+        return executeWithStub(WireMock.aResponse().withBody("some body"));
+    }
+
+    protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder) {
+        return executeWithStub(responseBuilder, RestAssured.given());
+    }
+
+    protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder, RequestSpecification spec) {
         final WireMockServer server = new WireMockServer(WireMockConfiguration.options().dynamicPort());
+        final int statusCode = responseBuilder.build().getStatus();
 
         return runWithinTestContext(() -> {
             server.start();
             WireMock.configureFor(server.port());
 
-            WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello")).willReturn(WireMock.aResponse().withBody("some body")));
+            WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form")).willReturn(responseBuilder));
             try {
-                RestAssured.when().get(server.url("/hello")).then().statusCode(200);
+                spec.contentType(ContentType.URLENC)
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(statusCode);
             } finally {
                 server.stop();
                 RestAssured.replaceFiltersWith(ImmutableList.of());
+                RestAssured.config = new RestAssuredConfig();
             }
         });
     }
-
 }
diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 037863975..a5ecc550d 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -1,95 +1,97 @@
-import org.gradle.jvm.tasks.Jar
-
 description = "Allure ScalaTest Integration"
 
-apply(plugin = "scala")
-
-val availableScalaVersions = listOf("2.11", "2.12", "2.13")
-val defaultScala211Version = "2.11.12"
-val defaultScala212Version = "2.12.8"
-val defaultScala213Version = "2.13.1"
-
-var selectedScalaVersion = defaultScala213Version
-
-if (hasProperty("scalaVersion")) {
-    val scalaVersion: String by project
-    selectedScalaVersion = when (scalaVersion) {
-        "2.11" -> defaultScala211Version
-        "2.12" -> defaultScala212Version
-        "2.13" -> defaultScala213Version
-        else -> scalaVersion
-    }
+plugins {
+    scala
+    id("com.github.prokod.gradle-crossbuild") version "0.17.0"
 }
 
-val baseScalaVersion = selectedScalaVersion.substring(0, selectedScalaVersion.lastIndexOf("."))
-project.base.archivesBaseName = "allure-scalatest_$baseScalaVersion"
-
-for (sv in availableScalaVersions) {
-    val taskSuffix = sv.replace('.', '_')
-
-    tasks.create("jarScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("jar")
-    }
-
-    tasks.create("testScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("test")
-    }
-
-    tasks.create("sourceJarScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("sourceJar")
-    }
+val scala212 = "2.12"
+val scala213 = "2.13"
 
-    tasks.create("scaladocJarScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("scaladocJar")
-    }
+project.base.archivesName.set("allure-scalatest")
 
-    tasks.create("installScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("install")
+crossBuild {
+    scalaVersionsCatalog = mapOf(
+        scala212 to "2.12.19",
+        scala213 to "2.13.14"
+    )
+    builds {
+        register("scala") {
+            scalaVersions = setOf(scala212, scala213)
+        }
     }
 }
 
-val jarAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "jarScala_${it.replace('.', '_')}" })
+tasks.publishMavenPublicationToMavenLocal {
+    enabled = false
 }
-
-val testAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "testScala_${it.replace('.', '_')}" })
+tasks.publishMavenPublicationToSonatypeRepository {
+    enabled = false
 }
-
-val sourceJarAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "sourceJarScala_${it.replace('.', '_')}" })
+tasks.signMavenPublication {
+    enabled = false
 }
-
-val scaladocJarAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "scaladocJarScala_${it.replace('.', '_')}" })
+tasks.sourcesJar {
+    enabled = false
 }
 
-val installAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "installScala_${it.replace('.', '_')}" })
+publishing {
+    publications {
+        create<MavenPublication>("crossBuildScala_212") {
+            from(components["crossBuildScala_212"])
+
+            val crossBuildScala_212SourcesJar by tasks.creating(Jar::class) {
+                from(sourceSets["crossBuildScala_212"].allSource)
+                archiveBaseName.set("allure-scalatest_$scala212")
+                archiveClassifier.set("sources")
+            }
+            artifact(crossBuildScala_212SourcesJar)
+
+            val crossBuildScala_212ScaladocJar by tasks.creating(Jar::class) {
+                from(tasks.scaladoc)
+                archiveBaseName.set("allure-scalatest_$scala212")
+                archiveClassifier.set("javadoc")
+            }
+            artifact(crossBuildScala_212ScaladocJar)
+        }
+        create<MavenPublication>("crossBuildScala_213") {
+            from(components["crossBuildScala_213"])
+
+            val crossBuildScala_213SourcesJar by tasks.creating(Jar::class) {
+                from(sourceSets["crossBuildScala_213"].allSource)
+                archiveBaseName.set("allure-scalatest_$scala213")
+                archiveClassifier.set("sources")
+            }
+            artifact(crossBuildScala_213SourcesJar)
+
+            val crossBuildScala_213ScaladocJar by tasks.creating(Jar::class) {
+                from(tasks.scaladoc)
+                archiveBaseName.set("allure-scalatest_$scala213")
+                archiveClassifier.set("javadoc")
+            }
+            artifact(crossBuildScala_213ScaladocJar)
+        }
+    }
 }
 
-val agent: Configuration by configurations.creating
+signing {
+    sign(
+        publishing.publications["crossBuildScala_212"],
+        publishing.publications["crossBuildScala_213"]
+    )
+}
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("org.scalatest:scalatest_$baseScalaVersion:3.1.1")
-    implementation("org.scala-lang.modules:scala-collection-compat_$baseScalaVersion:2.1.4")
+    compileOnly("org.scalatest:scalatest_$scala213:3.2.19")
+    compileOnly("org.scala-lang.modules:scala-collection-compat_$scala213:2.14.0")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.scalatest:scalatest_$scala213:3.2.19")
+    testImplementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.14.0")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
@@ -97,18 +99,13 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-val scaladocJar by tasks.creating(Jar::class) {
-    from(tasks.getByName("scaladoc"))
-    archiveClassifier.set("scaladoc")
-}
-
-artifacts.add("archives", scaladocJar)
-
 tasks.jar {
     manifest {
-        attributes(mapOf(
+        attributes(
+            mapOf(
                 "Automatic-Module-Name" to "io.qameta.allure.scalatest"
-        ))
+            )
+        )
     }
 }
 
@@ -116,7 +113,4 @@ tasks.test {
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/testdata/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml b/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
     </aspects>
-</aspectj>
\ No newline at end of file
+</aspectj>
diff --git a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
index bc4244db0..a1b84719e 100644
--- a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
+++ b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package io.qameta.allure.scalatest
 
 import java.lang.annotation.Annotation
-import java.util.UUID
+import java.util.{Objects, UUID}
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.ReentrantReadWriteLock
 
@@ -162,7 +162,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
       event.suiteClassName,
       event.location,
       event.testName,
-      None
+      Some(event.threadName)
     )
     stopTest(
       None,
@@ -180,7 +180,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     val uuid = UUID.randomUUID().toString
     var labels = mutable.ListBuffer(
       createSuiteLabel(suiteName),
-      createThreadLabel(),
+      createLabel(THREAD_LABEL_NAME, getScalaTestThreadName(threadId)),
       createHostLabel(),
       createLanguageLabel("scala"),
       createFrameworkLabel("scalatest")
@@ -227,15 +227,21 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
   private def stopTest(status: Option[Status],
                        statusDetails: Option[StatusDetails],
                        threadName: Option[String]): Unit = {
-    threadName.fold {} { thread => AllureScalatestContextHolder.remove(thread) }
-    lifecycle.getCurrentTestCase.ifPresent(uuid => {
-      lifecycle.updateTestCase(uuid, (result: TestResult) => {
-        status.fold {} { st => result.setStatus(st) }
-        statusDetails.fold {} { details => result.setStatusDetails(details) }
-      }: Unit)
-      lifecycle.stopTestCase(uuid)
-      lifecycle.writeTestCase(uuid)
-    })
+    threadName.fold {} {
+      thread => {
+        AllureScalatestContextHolder.get(thread).fold {} {
+          uuid => {
+            lifecycle.updateTestCase(uuid, (result: TestResult) => {
+              status.fold {} { st => result.setStatus(st) }
+              statusDetails.fold {} { details => result.setStatusDetails(details) }
+            }: Unit)
+            lifecycle.stopTestCase(uuid)
+            lifecycle.writeTestCase(uuid)
+          }
+            AllureScalatestContextHolder.remove(thread)
+        }
+      }
+    }
   }
 
   private def getAnnotations(location: Option[Location]): List[Annotation] = location match {
@@ -273,4 +279,11 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     }
   }
 
+  private def getScalaTestThreadName(threadId: Option[String]): String = {
+    val fromProperty = System.getProperty(ALLURE_THREAD_NAME_SYSPROP)
+    val fromEnv = System.getenv(ALLURE_THREAD_NAME_ENV)
+    val realThreadName = threadId.getOrElse {getThreadName}
+    Seq(fromProperty, fromEnv).find(el => Objects.nonNull(el)).getOrElse {realThreadName}
+  }
+
 }
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
index 085e617a4..03f172a3d 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
index 1b0e55df2..77cb1fdc5 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
index 85e283061..9e7b6460c 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
index 11e41d4d7..351fddf4a 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
index 66b84ea75..b13b174bd 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
index 26e2d1ce7..29f996fef 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
index 8cba30608..9a13d712d 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
index d363790c0..39011d68b 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
index e94fcd842..31bfcb563 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts
index 6473dcf2d..2ff19ced2 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,13 +1,11 @@
 description = "Allure Selenide Integration"
 
-val agent: Configuration by configurations.creating
-
-val selenideVersion = "5.11.0"
+val selenideVersion = "7.4.1"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("com.codeborne:selenide:$selenideVersion")
+    compileOnly("com.codeborne:selenide:$selenideVersion")
+    testImplementation("com.codeborne:selenide:$selenideVersion")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
@@ -17,17 +15,23 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.selenide"
-        ))
+tasks {
+    compileJava {
+        options.release.set(17)
     }
-}
-
-tasks.test {
-    useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
+    compileTestJava {
+        options.release.set(17)
+    }
+    jar {
+        manifest {
+            attributes(
+                mapOf(
+                    "Automatic-Module-Name" to "io.qameta.allure.selenide"
+                )
+            )
+        }
+    }
+    test {
+        useJUnitPlatform()
     }
 }
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
index 53aceea47..1f320f68b 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -52,7 +52,7 @@ public class AllureSelenide implements LogEventListener {
     private boolean saveScreenshots = true;
     private boolean savePageHtml = true;
     private boolean includeSelenideLocatorsSteps = true;
-    private final Map<LogType, Level> logTypesToSave = new HashMap<>();
+    private final Map<LogType, Level> logTypesToSave = new EnumMap<>(LogType.class);
     private final AllureLifecycle lifecycle;
 
     public AllureSelenide() {
@@ -93,8 +93,8 @@ public AllureSelenide disableLogs(final LogType logType) {
     private static Optional<byte[]> getScreenshotBytes() {
         try {
             return WebDriverRunner.hasWebDriverStarted()
-                ? Optional.of(((TakesScreenshot) WebDriverRunner.getWebDriver()).getScreenshotAs(OutputType.BYTES))
-                : Optional.empty();
+                    ? Optional.of(((TakesScreenshot) WebDriverRunner.getWebDriver()).getScreenshotAs(OutputType.BYTES))
+                    : Optional.empty();
         } catch (WebDriverException e) {
             LOGGER.warn("Could not get screen shot", e);
             return Optional.empty();
@@ -104,8 +104,8 @@ private static Optional<byte[]> getScreenshotBytes() {
     private static Optional<byte[]> getPageSourceBytes() {
         try {
             return WebDriverRunner.hasWebDriverStarted()
-                ? Optional.of(WebDriverRunner.getWebDriver().getPageSource().getBytes(UTF_8))
-                : Optional.empty();
+                    ? Optional.of(WebDriverRunner.getWebDriver().getPageSource().getBytes(UTF_8))
+                    : Optional.empty();
         } catch (WebDriverException e) {
             LOGGER.warn("Could not get page source", e);
             return Optional.empty();
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
index 9857debe2..97995efc5 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
index 4aaabffd7..889fd8ff5 100644
--- a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
+++ b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-servlet-api/build.gradle.kts b/allure-servlet-api/build.gradle.kts
index 91d9ac61a..55c4bdcdf 100644
--- a/allure-servlet-api/build.gradle.kts
+++ b/allure-servlet-api/build.gradle.kts
@@ -4,7 +4,8 @@ var servletApiVersion = "4.0.1"
 
 dependencies {
     api(project(":allure-attachments"))
-    implementation("javax.servlet:javax.servlet-api:$servletApiVersion")
+    compileOnly("javax.servlet:javax.servlet-api:$servletApiVersion")
+    testImplementation("javax.servlet:javax.servlet-api:$servletApiVersion")
 }
 
 tasks.jar {
diff --git a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
index b3a547053..a6434ea28 100644
--- a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
+++ b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("PMD.ClassNamingConventions")
 public final class HttpServletAttachmentBuilder {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpServletAttachmentBuilder.class);
@@ -74,7 +73,6 @@ public static String getBody(final HttpServletRequest request) {
         return sb.toString();
     }
 
-    @SuppressWarnings("PMD.AssignmentInOperand")
     public static void readBody(final StringBuilder sb,
                                 final BufferedReader reader) throws IOException {
         String line;
diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts
index a6c58b49e..669bf14b7 100644
--- a/allure-spock/build.gradle.kts
+++ b/allure-spock/build.gradle.kts
@@ -2,19 +2,18 @@ description = "Allure Spock Framework Integration"
 
 apply(plugin = "groovy")
 
-val agent: Configuration by configurations.creating
-
-val spockFrameworkVersion = "1.2-groovy-2.5"
+val spockFrameworkVersion = "1.3-groovy-2.5"
+val groovyVersion = "2.5.23"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("org.spockframework:spock-core:$spockFrameworkVersion")
+    compileOnly("org.spockframework:spock-core:$spockFrameworkVersion")
     testImplementation("org.assertj:assertj-core")
-    testImplementation("org.codehaus.groovy:groovy-all")
+    testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.spockframework:spock-core:$spockFrameworkVersion")
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
@@ -31,7 +30,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
index 4157abd74..f29578ddc 100644
--- a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
+++ b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -72,10 +72,7 @@
  * @author charlie (Dmitry Baev).
  */
 @SuppressWarnings({
-        "PMD.UnnecessaryFullyQualifiedName",
-        "PMD.ExcessiveImports",
         "ClassFanOutComplexity",
-        "PMD.CouplingBetweenObjects"
 })
 public class AllureSpock extends AbstractRunListener implements IGlobalExtension {
 
diff --git a/allure-spock/src/main/resources/META-INF/aop-ajc.xml b/allure-spock/src/main/resources/META-INF/aop-ajc.xml
index 1f439cb73..09e38300c 100644
--- a/allure-spock/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-spock/src/main/resources/META-INF/aop-ajc.xml
@@ -1,4 +1,5 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
index 4b9e005ca..f7bc5af8b 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,10 +15,6 @@
  */
 package io.qameta.allure.spock;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Parameter;
@@ -37,7 +33,7 @@
 import io.qameta.allure.spock.samples.TestWithCustomAnnotations;
 import io.qameta.allure.spock.samples.TestWithSteps;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.notification.RunNotifier;
 import org.spockframework.runtime.JUnitDescriptionGenerator;
@@ -225,32 +221,16 @@ void shouldSupportDataDrivenTests() {
     }
 
     protected AllureResults run(final Class<?> clazz) {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(results);
+        return RunUtils.runTests(lifecycle -> {
+            final RunNotifier notifier = new RunNotifier();
+            final SpecInfo spec = new SpecInfoBuilder(clazz).build();
+            spec.addListener(new AllureSpock(lifecycle));
 
-        final RunNotifier notifier = new RunNotifier();
-        final SpecInfo spec = new SpecInfoBuilder(clazz).build();
-        spec.addListener(new AllureSpock(lifecycle));
-
-        new JUnitDescriptionGenerator(spec).describeSpecMethods();
-        new JUnitDescriptionGenerator(spec).describeSpec();
-
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+            new JUnitDescriptionGenerator(spec).describeSpecMethods();
+            new JUnitDescriptionGenerator(spec).describeSpec();
 
             RunContext.get().createSpecRunner(spec, notifier).run();
-        } catch (Exception e) {
-            throw new RuntimeException("could not execute sample", e);
-        } finally {
-            Allure.setLifecycle(cached);
-            StepsAspects.setLifecycle(cached);
-            AttachmentsAspects.setLifecycle(cached);
-        }
-
-        return results;
+        });
     }
 
     private static Predicate<TestResult> mutedPredicate() {
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
index f3b7b5d33..908722f4a 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
index 4b5512c81..e07a9db3a 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
index 913120c53..00bf73451 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
index ec3afda57..ad8c2234c 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
index 055a01137..28f18540e 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
index 3f357adbd..506c514ba 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
index 95e80a03c..d7b086890 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
index 5b7f691a6..c6eda8825 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
index 1995b0575..32efd0e2a 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
index 438e4a162..1e019b408 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
index cd91a219f..2055e1d73 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/build.gradle.kts b/allure-spock2/build.gradle.kts
new file mode 100644
index 000000000..1a1226597
--- /dev/null
+++ b/allure-spock2/build.gradle.kts
@@ -0,0 +1,61 @@
+description = "Allure Spock 2 Framework Integration"
+
+plugins {
+    groovy
+}
+
+val spockFrameworkVersion = "2.3-groovy-3.0"
+val groovyVersion = "3.0.22"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    compileOnly("org.aspectj:aspectjrt")
+    compileOnly("org.spockframework:spock-core:$spockFrameworkVersion")
+    implementation(project(":allure-test-filter"))
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.codehaus.groovy:groovy:${groovyVersion}")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.spockframework:spock-core:$spockFrameworkVersion")
+    testImplementation(project(":allure-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.spock2"
+        ))
+    }
+
+    from("src/main/services") {
+        into("META-INF/services")
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    exclude("**/samples/*")
+}
+
+val spiOffJar: Jar by tasks.creating(Jar::class) {
+    from(sourceSets.getByName("main").output)
+    archiveClassifier.set("spi-off")
+}
+
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
+}
+
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
new file mode 100644
index 000000000..8798e1f40
--- /dev/null
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -0,0 +1,447 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureId;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.testfilter.FileTestPlanSupplier;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import io.qameta.allure.util.AnnotationUtils;
+import io.qameta.allure.util.ExceptionUtils;
+import io.qameta.allure.util.ResultsUtils;
+import org.spockframework.runtime.AbstractRunListener;
+import org.spockframework.runtime.extension.IGlobalExtension;
+import org.spockframework.runtime.extension.IMethodInterceptor;
+import org.spockframework.runtime.extension.IMethodInvocation;
+import org.spockframework.runtime.model.ErrorInfo;
+import org.spockframework.runtime.model.FeatureInfo;
+import org.spockframework.runtime.model.IterationInfo;
+import org.spockframework.runtime.model.MethodInfo;
+import org.spockframework.runtime.model.MethodKind;
+import org.spockframework.runtime.model.SpecInfo;
+import org.spockframework.runtime.model.TestTag;
+
+import java.lang.reflect.Method;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static io.qameta.allure.util.ResultsUtils.bytesToHex;
+import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
+import static io.qameta.allure.util.ResultsUtils.createHostLabel;
+import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
+import static io.qameta.allure.util.ResultsUtils.createPackageLabel;
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createParentSuiteLabel;
+import static io.qameta.allure.util.ResultsUtils.createSubSuiteLabel;
+import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
+import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
+import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel;
+import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.firstNonEmpty;
+import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
+import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static io.qameta.allure.util.ResultsUtils.md5;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Comparator.comparing;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension {
+
+    private final ThreadLocal<String> testResults = new InheritableThreadLocal<String>() {
+        @Override
+        protected String initialValue() {
+            return UUID.randomUUID().toString();
+        }
+    };
+
+    private final AllureLifecycle lifecycle;
+
+    private final TestPlan testPlan;
+
+    @SuppressWarnings("unused")
+    public AllureSpock2() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureSpock2(final AllureLifecycle lifecycle) {
+        this(lifecycle, new FileTestPlanSupplier().supply().orElse(null));
+    }
+
+    public AllureSpock2(final AllureLifecycle lifecycle, final TestPlan plan) {
+        this.lifecycle = lifecycle;
+        this.testPlan = plan;
+    }
+
+    @Override
+    public void visitSpec(final SpecInfo spec) {
+        spec.getAllFeatures().forEach(methodInfo -> methodInfo.setSkipped(this.isSkipped(methodInfo)));
+
+        spec.addListener(this);
+
+        final String specContainerUuid = UUID.randomUUID().toString();
+        spec.addInterceptor(new AllureContainerInterceptor(specContainerUuid));
+
+        spec.getAllFixtureMethods().forEach(methodInfo -> {
+            if (methodInfo.getKind().isSpecScopedFixtureMethod()) {
+                methodInfo.addInterceptor(new AllureSpecFixtureMethodInterceptor(specContainerUuid));
+            }
+            if (methodInfo.getKind().isFeatureScopedFixtureMethod()) {
+                methodInfo.addInterceptor(new AllureFeatureFixtureMethodInterceptor());
+            }
+        });
+
+        // add each feature to this container
+        spec.getAllFeatures().stream()
+                .map(FeatureInfo::getFeatureMethod)
+                .filter(Objects::nonNull)
+                .forEach(fm -> fm.addInterceptor(i -> {
+                    getLifecycle().getCurrentTestCaseOrStep().ifPresent(uuid -> {
+                        getLifecycle().updateTestContainer(
+                                specContainerUuid,
+                                c -> c.getChildren().add(uuid)
+                        );
+                    });
+                    i.proceed();
+                }));
+    }
+
+    @Override
+    public void beforeIteration(final IterationInfo iteration) {
+        final String uuid = testResults.get();
+
+        final FeatureInfo feature = iteration.getFeature();
+        final MethodInfo methodInfo = feature.getFeatureMethod();
+        final Method method = methodInfo.getReflection();
+        final Set<Label> featureLabels = AnnotationUtils.getLabels(method);
+        final Set<Link> featureLinks = AnnotationUtils.getLinks(method);
+        final SpecInfo specInfo = feature.getSpec();
+        final Class<?> clazz = specInfo.getReflection();
+        final Set<Label> specLabels = AnnotationUtils.getLabels(clazz);
+        final Set<Link> specLinks = AnnotationUtils.getLinks(clazz);
+        final boolean flaky = AnnotationUtils.isFlaky(method) || AnnotationUtils.isFlaky(clazz);
+        final boolean muted = AnnotationUtils.isMuted(method) || AnnotationUtils.isMuted(clazz);
+
+        final List<Parameter> parameters = getParameters(feature.getDataVariables(), iteration.getDataValues());
+        final SpecInfo subSpec = specInfo.getSubSpec();
+        final SpecInfo superSpec = specInfo.getSuperSpec();
+        final String packageName = specInfo.getPackage();
+        final String specName = specInfo.getName();
+        final String testClassName = feature.getSpec().getReflection().getName();
+        final String testMethodName = iteration.getDisplayName();
+
+        final List<Label> labels = new ArrayList<>(Arrays.asList(
+                createPackageLabel(packageName),
+                createTestClassLabel(testClassName),
+                createTestMethodLabel(testMethodName),
+                createSuiteLabel(specName),
+                createHostLabel(),
+                createThreadLabel(),
+                createFrameworkLabel("spock"),
+                createLanguageLabel("java")
+        ));
+
+        if (Objects.nonNull(subSpec)) {
+            labels.add(createSubSuiteLabel(subSpec.getName()));
+        }
+
+        if (Objects.nonNull(superSpec)) {
+            labels.add(createParentSuiteLabel(superSpec.getName()));
+        }
+
+        final List<Label> testTags = feature.getTestTags().stream()
+                .map(TestTag::getValue)
+                .map(ResultsUtils::createTagLabel)
+                .collect(Collectors.toList());
+
+        labels.addAll(testTags);
+        labels.addAll(featureLabels);
+        labels.addAll(specLabels);
+        labels.addAll(getProvidedLabels());
+
+        final List<Link> links = new ArrayList<>(featureLinks);
+        links.addAll(specLinks);
+
+        final String qualifiedName = getQualifiedName(iteration);
+        final TestResult result = new TestResult()
+                .setUuid(uuid)
+                .setHistoryId(getHistoryId(qualifiedName, parameters))
+                .setTestCaseName(iteration.getName())
+                .setTestCaseId(md5(qualifiedName))
+                .setFullName(qualifiedName)
+                .setName(
+                        firstNonEmpty(testMethodName, iteration.getName(), qualifiedName)
+                                .orElse("Unknown")
+                )
+                .setStatusDetails(new StatusDetails()
+                        .setFlaky(flaky)
+                        .setMuted(muted)
+                )
+                .setParameters(parameters)
+                .setLinks(links)
+                .setLabels(labels);
+
+        ResultsUtils.processDescription(
+                getClass().getClassLoader(),
+                method,
+                result::setDescription,
+                result::setDescriptionHtml
+        );
+
+        getLifecycle().scheduleTestCase(result);
+        getLifecycle().startTestCase(uuid);
+
+    }
+
+    private String getQualifiedName(final IterationInfo iteration) {
+        return this.getQualifiedName(iteration.getFeature().getSpec().getReflection().getName(), iteration.getName());
+    }
+
+    private String getQualifiedName(final FeatureInfo featureInfo) {
+        return this.getQualifiedName(featureInfo.getSpec().getReflection().getName(), featureInfo.getName());
+    }
+
+    private String getQualifiedName(final String specName, final String testName) {
+        return specName + "." + testName;
+    }
+
+    private String getHistoryId(final String name, final List<Parameter> parameters) {
+        final MessageDigest digest = getMd5Digest();
+        digest.update(name.getBytes(UTF_8));
+        parameters.stream()
+                .sorted(comparing(Parameter::getName).thenComparing(Parameter::getValue))
+                .forEachOrdered(parameter -> {
+                    digest.update(parameter.getName().getBytes(UTF_8));
+                    digest.update(parameter.getValue().getBytes(UTF_8));
+                });
+        final byte[] bytes = digest.digest();
+        return bytesToHex(bytes);
+    }
+
+    private boolean isSkipped(final FeatureInfo featureInfo) {
+        if (Objects.isNull(this.testPlan)) {
+            return false;
+        }
+        if (this.testPlan instanceof TestPlanV1_0) {
+            final TestPlanV1_0 tp = (TestPlanV1_0) testPlan;
+            return !Objects.isNull(tp.getTests()) && tp.getTests()
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .noneMatch(tc -> this.match(
+                            tc,
+                            this.getAllureId(featureInfo),
+                            this.getQualifiedName(featureInfo))
+                    );
+        }
+        return false;
+    }
+
+    private String getAllureId(final FeatureInfo featureInfo) {
+        final AllureId annotation = featureInfo.getFeatureMethod().getAnnotation(AllureId.class);
+        if (Objects.nonNull(annotation)) {
+            return annotation.value();
+        }
+        return null;
+    }
+
+    private boolean match(final TestPlanV1_0.TestCase tc, final String allureId, final String qualifiedName) {
+        return Objects.equals(allureId, tc.getId()) || Objects.equals(qualifiedName, tc.getSelector());
+    }
+
+    @Override
+    public void error(final ErrorInfo error) {
+        final String uuid = testResults.get();
+        getLifecycle().updateTestCase(uuid, testResult -> testResult
+                .setStatus(getStatus(error.getException()).orElse(null))
+                .setStatusDetails(getStatusDetails(error.getException()).orElse(null))
+        );
+    }
+
+    @Override
+    public void afterIteration(final IterationInfo iteration) {
+        final String uuid = testResults.get();
+        testResults.remove();
+
+        getLifecycle().updateTestCase(uuid, testResult -> {
+            if (Objects.isNull(testResult.getStatus())) {
+                testResult.setStatus(Status.PASSED);
+            }
+        });
+        getLifecycle().stopTestCase(uuid);
+        getLifecycle().writeTestCase(uuid);
+    }
+
+    private List<Parameter> getParameters(final List<String> names, final Object... values) {
+        return IntStream.range(0, Math.min(names.size(), values.length))
+                .mapToObj(index -> createParameter(names.get(index), values[index]))
+                .collect(Collectors.toList());
+    }
+
+    public AllureLifecycle getLifecycle() {
+        return lifecycle;
+    }
+
+    /**
+     * IMethodInterceptor that reports feature fixture methods.
+     * Creates container and fixture result for feature fixtures. Such fixtures (setup/cleanup) are
+     * executed within iteration, so we can access current test uuid
+     * from Allure context. But then we need to not forget to restore it to context, because
+     * thread context is cleared on fixture start event.
+     */
+    @SuppressWarnings("FinalClass")
+    private class AllureFeatureFixtureMethodInterceptor extends AllureSpecFixtureMethodInterceptor {
+
+        private AllureFeatureFixtureMethodInterceptor() {
+            this(UUID.randomUUID().toString());
+        }
+
+        private AllureFeatureFixtureMethodInterceptor(final String containerUuid) {
+            super(containerUuid);
+        }
+
+        @Override
+        public void intercept(final IMethodInvocation invocation) throws Throwable {
+            final String uuid = getLifecycle().getCurrentTestCase().orElse(null);
+            if (Objects.isNull(uuid)) {
+                invocation.proceed();
+                return;
+            }
+
+            final TestResultContainer container = new TestResultContainer()
+                    .setUuid(containerUuid);
+
+            container.getChildren().add(uuid);
+
+            getLifecycle().startTestContainer(container);
+
+            try {
+                super.intercept(invocation);
+            } finally {
+                getLifecycle().stopTestContainer(containerUuid);
+                getLifecycle().writeTestContainer(containerUuid);
+                getLifecycle().setCurrentTestCase(uuid);
+            }
+        }
+    }
+
+    /**
+     * IMethodInterceptor that reports spec fixture methods. All spec fixture methods
+     * are using the same container. Container is managed by {@link  AllureContainerInterceptor}.
+     */
+    @SuppressWarnings("FinalClass")
+    private class AllureSpecFixtureMethodInterceptor implements IMethodInterceptor {
+
+        protected final String containerUuid;
+
+        private AllureSpecFixtureMethodInterceptor(final String containerUuid) {
+            this.containerUuid = containerUuid;
+        }
+
+        @Override
+        public void intercept(final IMethodInvocation invocation) throws Throwable {
+            final String fixtureUuid = UUID.randomUUID().toString();
+
+            final MethodKind kind = invocation.getMethod().getKind();
+            final String fixtureName = kind.name().toLowerCase(Locale.ENGLISH).replace('_', ' ');
+
+            final FixtureResult fixtureResult = new FixtureResult()
+                    .setName(fixtureName);
+
+            if (kind.isSetupMethod()) {
+                getLifecycle().startPrepareFixture(
+                        containerUuid,
+                        fixtureUuid,
+                        fixtureResult
+                );
+            } else {
+                getLifecycle().startTearDownFixture(
+                        containerUuid,
+                        fixtureUuid,
+                        fixtureResult
+                );
+            }
+
+            try {
+                invocation.proceed();
+                getLifecycle().updateFixture(
+                        fixtureUuid,
+                        f -> f.setStatus(Status.PASSED)
+                );
+            } catch (Throwable throwable) {
+                getLifecycle().updateFixture(
+                        fixtureUuid,
+                        f -> f
+                                .setStatus(getStatus(throwable).orElse(Status.BROKEN))
+                                .setStatusDetails(getStatusDetails(throwable).orElse(null))
+                );
+                throw ExceptionUtils.sneakyThrow(throwable);
+            } finally {
+                getLifecycle().stopFixture(fixtureUuid);
+            }
+        }
+
+    }
+
+    /**
+     * IMethodInterceptor that creates container per spec.
+     */
+    @SuppressWarnings("FinalClass")
+    private class AllureContainerInterceptor implements IMethodInterceptor {
+
+        private final String containerUuid;
+
+        private AllureContainerInterceptor(final String containerUuid) {
+            this.containerUuid = containerUuid;
+        }
+
+        @Override
+        public void intercept(final IMethodInvocation invocation) throws Throwable {
+            final TestResultContainer container = new TestResultContainer()
+                    .setUuid(containerUuid);
+
+            getLifecycle().startTestContainer(container);
+
+            try {
+                invocation.proceed();
+            } finally {
+                getLifecycle().stopTestContainer(containerUuid);
+                getLifecycle().writeTestContainer(containerUuid);
+            }
+        }
+    }
+
+}
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
new file mode 100644
index 000000000..4db9dc0fe
--- /dev/null
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
@@ -0,0 +1,174 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.compiler;
+
+import io.qameta.allure.Allure;
+import org.codehaus.groovy.ast.ASTNode;
+import org.codehaus.groovy.ast.ClassHelper;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.ConstructorNode;
+import org.codehaus.groovy.ast.FieldNode;
+import org.codehaus.groovy.ast.GroovyClassVisitor;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.PropertyNode;
+import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
+import org.codehaus.groovy.ast.stmt.BlockStatement;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
+import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.classgen.VariableScopeVisitor;
+import org.codehaus.groovy.control.CompilePhase;
+import org.codehaus.groovy.control.SourceUnit;
+import org.codehaus.groovy.transform.ASTTransformation;
+import org.codehaus.groovy.transform.GroovyASTTransformation;
+import org.spockframework.compiler.AstNodeCache;
+import org.spockframework.compiler.AstUtil;
+import org.spockframework.compiler.ErrorReporter;
+import org.spockframework.compiler.SourceLookup;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@GroovyASTTransformation(phase = CompilePhase.SEMANTIC_ANALYSIS)
+public class AllureStatementsLabelsToStepsTransformation implements ASTTransformation {
+
+    @Override
+    public void visit(final ASTNode[] nodes, final SourceUnit sourceUnit) {
+        new Impl().visit(sourceUnit);
+    }
+
+    /**
+     * Use of nested class defers linking until after groovy version check.
+     */
+    private static final class Impl {
+        private static final AstNodeCache NODE_CACHE = new AstNodeCache();
+
+        private void visit(final SourceUnit sourceUnit) {
+            final ErrorReporter errorReporter = new ErrorReporter(sourceUnit);
+            final SourceLookup sourceLookup = new SourceLookup(sourceUnit);
+
+            try {
+                sourceUnit.getAST().getClasses().stream()
+                        .filter(this::isSpec)
+                        .forEach(clazz -> processSpec(sourceUnit, clazz, errorReporter));
+            } finally {
+                sourceLookup.close();
+            }
+        }
+
+        private boolean isSpec(final ClassNode clazz) {
+            return clazz.isDerivedFrom(NODE_CACHE.Specification);
+        }
+
+        private void processSpec(final SourceUnit sourceUnit,
+                                 final ClassNode clazz,
+                                 final ErrorReporter errorReporter) {
+            try {
+                clazz.visitContents(new MethodVisitor());
+                if (!sourceUnit.getErrorCollector().hasErrors()) {
+                    new VariableScopeVisitor(sourceUnit).visitClass(clazz);
+                }
+            } catch (Exception e) {
+                errorReporter.error(
+                        "Unexpected error during compilation of spec '%s'."
+                        + " Please file a bug report at https://github.com/allure-framework/allure-java.",
+                        e, clazz.getName()
+                );
+            }
+        }
+    }
+
+    /**
+     * Adds Allure steps for statements with labels.
+     */
+    private static final class MethodVisitor implements GroovyClassVisitor {
+
+        private static final ClassNode ALLURE = ClassHelper.makeWithoutCaching(Allure.class);
+
+        @Override
+        public void visitClass(final ClassNode node) {
+            // do nothing
+        }
+
+        @Override
+        public void visitConstructor(final ConstructorNode node) {
+            // do nothing
+        }
+
+        @Override
+        public void visitMethod(final MethodNode node) {
+            final List<Statement> newStatements = AstUtil.getStatements(node).stream()
+                    .flatMap(statement -> Stream.concat(
+                            getAllureStepStatements(statement),
+                            Stream.of(statement)
+                    ))
+                    .collect(Collectors.toList());
+
+            node.setCode(new BlockStatement(
+                    newStatements,
+                    ((BlockStatement) node.getCode()).getVariableScope())
+            );
+        }
+
+        @Override
+        public void visitField(final FieldNode node) {
+            // do nothing
+        }
+
+        @Override
+        public void visitProperty(final PropertyNode node) {
+            // do nothing
+        }
+
+        @SuppressWarnings("PMD.AvoidDeeplyNestedIfStmts")
+        private static Stream<Statement> getAllureStepStatements(final Statement statement) {
+            if (Objects.nonNull(statement.getStatementLabels())
+                && !statement.getStatementLabels().isEmpty()) {
+                final String labels = String.join(" ", statement.getStatementLabels());
+                final StringBuilder builder = new StringBuilder(labels);
+
+                if (statement instanceof ExpressionStatement) {
+                    final ExpressionStatement es = (ExpressionStatement) statement;
+                    if (es.getExpression() instanceof ConstantExpression) {
+                        final Object value = ((ConstantExpression) es.getExpression()).getValue();
+                        if (value instanceof String) {
+                            builder.append(": ").append(value);
+                        }
+                    }
+                }
+
+                final String stepName = builder.toString();
+
+                return Stream.of(new ExpressionStatement(
+                        new StaticMethodCallExpression(
+                                ALLURE,
+                                "step",
+                                new ArgumentListExpression(
+                                        new ConstantExpression(stepName)
+                                )
+                        )
+                ));
+            }
+            return Stream.empty();
+        }
+    }
+}
diff --git a/allure-spock2/src/main/resources/META-INF/aop-ajc.xml b/allure-spock2/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-spock2/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>
diff --git a/allure-spock2/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/allure-spock2/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
new file mode 100644
index 000000000..8d032ed1f
--- /dev/null
+++ b/allure-spock2/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -0,0 +1 @@
+io.qameta.allure.spock2.compiler.AllureStatementsLabelsToStepsTransformation
diff --git a/allure-spock2/src/main/services/org.spockframework.runtime.extension.IGlobalExtension b/allure-spock2/src/main/services/org.spockframework.runtime.extension.IGlobalExtension
new file mode 100644
index 000000000..9ac0ecfb8
--- /dev/null
+++ b/allure-spock2/src/main/services/org.spockframework.runtime.extension.IGlobalExtension
@@ -0,0 +1 @@
+io.qameta.allure.spock2.AllureSpock2
\ No newline at end of file
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
new file mode 100644
index 000000000..c5c55f79a
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -0,0 +1,641 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2;
+
+import io.qameta.allure.Step;
+import io.qameta.allure.model.ExecutableItem;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.spock2.samples.BrokenTest;
+import io.qameta.allure.spock2.samples.DataDrivenTest;
+import io.qameta.allure.spock2.samples.DerivedSpec;
+import io.qameta.allure.spock2.samples.FailedTest;
+import io.qameta.allure.spock2.samples.FixturesTest;
+import io.qameta.allure.spock2.samples.HelloSpockSpec;
+import io.qameta.allure.spock2.samples.OneTest;
+import io.qameta.allure.spock2.samples.ParametersTest;
+import io.qameta.allure.spock2.samples.SpecFixtures;
+import io.qameta.allure.spock2.samples.SpockTags;
+import io.qameta.allure.spock2.samples.StepsAndBlocks;
+import io.qameta.allure.spock2.samples.TestWithAnnotations;
+import io.qameta.allure.spock2.samples.TestWithAnnotationsOnClass;
+import io.qameta.allure.spock2.samples.TestWithCustomAnnotations;
+import io.qameta.allure.spock2.samples.TestWithSteps;
+import io.qameta.allure.spock2.samples.TestsWithIdForFilter;
+import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.LauncherConfig;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+import org.spockframework.runtime.GlobalExtensionRegistry;
+import org.spockframework.runtime.RunContext;
+import org.spockframework.runtime.SpockEngine;
+
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class AllureSpock2Test {
+
+    @Test
+    void shouldStoreTestsInformation() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .hasSize(1);
+    }
+
+    @Test
+    void shouldSupportTestsWithStepsAndBlocks() {
+        final AllureResults results = runClasses(StepsAndBlocks.class);
+        assertThat(results.getTestResults())
+                .hasSize(1);
+
+        final TestResult tr = results.getTestResults().get(0);
+
+        assertThat(tr.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "given: asd",
+                        "step1",
+                        "step2",
+                        "step some",
+                        "when",
+                        "step3",
+                        "step4",
+                        "then",
+                        "step5",
+                        "step6"
+                );
+    }
+
+    @Test
+    void shouldSupportBlocks() {
+        final AllureResults results = runClasses(HelloSpockSpec.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, this::printSteps)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "length of Spock's and his friends' names [name: Spock, length: 5, #0]",
+                                "expect, where"
+                        ),
+                        tuple(
+                                "length of Spock's and his friends' names [name: Kirk, length: 4, #1]",
+                                "expect, where"
+                        ),
+                        tuple(
+                                "length of Spock's and his friends' names [name: Scotty, length: 6, #2]",
+                                "expect, where"
+                        )
+                );
+    }
+
+    @Test
+    void shouldSetTestStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runClasses(OneTest.class);
+
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetTestStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runClasses(OneTest.class);
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetTestFullName() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getFullName)
+                .containsExactly("io.qameta.allure.spock2.samples.OneTest.Simple Test");
+    }
+
+    @Test
+    void shouldSetStageFinished() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStage)
+                .containsExactly(Stage.FINISHED);
+    }
+
+    @Test
+    void shouldProcessFailedTest() {
+        final AllureResults results = runClasses(FailedTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactly(Status.FAILED);
+    }
+
+    @Test
+    void shouldProcessBrokenTest() {
+        final AllureResults results = runClasses(BrokenTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactly(Status.BROKEN);
+    }
+
+    @Test
+    void shouldAddStepsToTest() {
+        final AllureResults results = runClasses(TestWithSteps.class);
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("expect", "step1", "step2", "step3");
+    }
+
+    @Test
+    void shouldProcessMethodAnnotations() {
+        final AllureResults results = runClasses(TestWithAnnotations.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "epic1"),
+                        tuple("epic", "epic2"),
+                        tuple("epic", "epic3"),
+                        tuple("feature", "feature1"),
+                        tuple("feature", "feature2"),
+                        tuple("feature", "feature3"),
+                        tuple("story", "story1"),
+                        tuple("story", "story2"),
+                        tuple("story", "story3"),
+                        tuple("owner", "some-owner")
+                );
+    }
+
+    @Test
+    void shouldProcessSpockTags() {
+        final AllureResults results = runClasses(SpockTags.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("tag", "first"),
+                        tuple("tag", "second")
+                );
+    }
+
+    @Test
+    void shouldProcessClassAnnotations() {
+        final AllureResults results = runClasses(TestWithAnnotationsOnClass.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getValue)
+                .contains(
+                        "epic1", "epic2", "epic3",
+                        "feature1", "feature2", "feature3",
+                        "story1", "story2", "story3",
+                        "some-owner"
+                );
+    }
+
+    @Test
+    void shouldProcessCustomAnnotations() {
+        final AllureResults results = runClasses(TestWithCustomAnnotations.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getValue)
+                .contains(
+                        "epic", "feature", "story", "AS-1", "XRT-1"
+                );
+    }
+
+    @Test
+    void shouldProcessFlakyAnnotation() {
+        final AllureResults results = runClasses(TestWithAnnotations.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getStatusDetails().isFlaky())
+                .containsExactlyInAnyOrder(
+                        tuple("someTest", true)
+                );
+    }
+
+    @Test
+    void shouldProcessMutedAnnotation() {
+        final AllureResults results = runClasses(TestWithAnnotations.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getStatusDetails().isMuted())
+                .containsExactlyInAnyOrder(
+                        tuple("someTest", true)
+                );
+    }
+
+    @Test
+    void shouldSetDisplayName() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName)
+                .containsExactly("Simple Test");
+    }
+
+    @Test
+    void shouldSetLinks() {
+        final AllureResults results = runClasses(FailedTest.class);
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName)
+                .containsExactlyInAnyOrder("link-1", "link-2", "issue-1", "issue-2", "tms-1", "tms-2");
+    }
+
+    @Test
+    void shouldSetParameters() {
+        final AllureResults results = runClasses(ParametersTest.class);
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"),
+                        tuple("b", "3"),
+                        tuple("c", "3")
+                );
+    }
+
+    @Test
+    void shouldSupportDataDrivenTests() {
+        final AllureResults results = runClasses(DataDrivenTest.class);
+        assertThat(results.getTestResults())
+                .extracting(
+                        TestResult::getName,
+                        TestResult::getFullName,
+                        TestResult::getTestCaseName,
+                        TestResult::getTestCaseId,
+                        TestResult::getHistoryId
+                )
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Simple Test [a: 1, b: 3, c: 3, #0]",
+                                "io.qameta.allure.spock2.samples.DataDrivenTest.Simple Test",
+                                "Simple Test",
+                                "c7d975849471fd7b3d9e6637744a3154",
+                                "8d0c81dcc577daba0013d9f64eac328b"
+                        ),
+                        tuple(
+                                "Simple Test [a: 7, b: 4, c: 7, #1]",
+                                "io.qameta.allure.spock2.samples.DataDrivenTest.Simple Test",
+                                "Simple Test",
+                                "c7d975849471fd7b3d9e6637744a3154",
+                                "29f09c26cfc058d5aa5e83cdf84f4e9d"
+                        ),
+                        tuple(
+                                "Simple Test [a: 0, b: 0, c: 0, #2]",
+                                "io.qameta.allure.spock2.samples.DataDrivenTest.Simple Test",
+                                "Simple Test",
+                                "c7d975849471fd7b3d9e6637744a3154",
+                                "e9a7c12cf7d0cf84d4a2ee322435c10f"
+                        )
+                );
+    }
+
+    @Test
+    void shouldSupportFixtures() {
+        final AllureResults results = runClasses(FixturesTest.class);
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(
+                        FixtureResult::getName,
+                        this::printSteps
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("setup spec", "setupSpec step 1, setupSpec step 2"),
+                        tuple("setup", "setup step 1, setup step 2"),
+                        tuple("setup", "setup step 1, setup step 2")
+                );
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(
+                        FixtureResult::getName,
+                        this::printSteps
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("cleanup spec", "cleanupSpec step 1, cleanupSpec step 2"),
+                        tuple("cleanup", "cleanup step 1, cleanup step 2"),
+                        tuple("cleanup", "cleanup step 1, cleanup step 2")
+                );
+
+
+        final TestResult tr1 = results.getTestResults().stream()
+                .filter(tr -> "First Test".equals(tr.getName()))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("can't find a test"));
+
+        final TestResult tr2 = results.getTestResults().stream()
+                .filter(tr -> "Second Test".equals(tr.getName()))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("can't find a test"));
+
+        assertThat(results.getTestResultContainers())
+                .extracting(TestResultContainer::getChildren)
+                .usingDefaultElementComparator()
+                .containsExactlyInAnyOrder(
+                        Collections.singletonList(tr1.getUuid()),
+                        Collections.singletonList(tr1.getUuid()),
+                        Collections.singletonList(tr2.getUuid()),
+                        Collections.singletonList(tr2.getUuid()),
+                        Arrays.asList(tr1.getUuid(), tr2.getUuid())
+                );
+    }
+
+    @Test
+    void shouldSupportFixturesFromDerivedSpecs() {
+        final AllureResults results = runClasses(DerivedSpec.class);
+
+        final List<Triple<String, List<String>, List<String>>> fixtures = getTrFixtures(results);
+
+        assertThat(fixtures)
+                .extracting(Triple::getLeft, Triple::getMiddle, Triple::getRight)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "baseSpecMethod",
+                                Arrays.asList(
+                                        "setup [ base setup() ] ",
+                                        "setup [ derived setup() ] ",
+                                        "setup spec [ base setupSpec() ] ",
+                                        "setup spec [ derived setupSpec() ] "
+                                ),
+                                Arrays.asList(
+                                        "cleanup [ base cleanup() ] ",
+                                        "cleanup [ derived cleanup() ] ",
+                                        "cleanup spec [ base cleanupSpec() ] ",
+                                        "cleanup spec [ derived cleanupSpec() ] "
+                                )
+                        ),
+                        tuple(
+                                "derivedSpecMethod",
+                                Arrays.asList(
+                                        "setup [ base setup() ] ",
+                                        "setup [ derived setup() ] ",
+                                        "setup spec [ base setupSpec() ] ",
+                                        "setup spec [ derived setupSpec() ] "
+                                ),
+                                Arrays.asList(
+                                        "cleanup [ base cleanup() ] ",
+                                        "cleanup [ derived cleanup() ] ",
+                                        "cleanup spec [ base cleanupSpec() ] ",
+                                        "cleanup spec [ derived cleanupSpec() ] "
+                                )
+                        )
+                );
+
+    }
+
+    private List<Triple<String, List<String>, List<String>>> getTrFixtures(final AllureResults results) {
+        final Map<String, List<TestResultContainer>> trContainers = results.getTestResultContainers().stream()
+                .flatMap(container -> container.getChildren().stream().map(child -> Pair.of(child, container)))
+                .collect(Collectors.groupingBy(Pair::getKey, Collectors.mapping(Pair::getValue, Collectors.toList())));
+
+        return results.getTestResults().stream().map(tr -> {
+                    final List<TestResultContainer> containers = trContainers
+                            .getOrDefault(tr.getUuid(), Collections.emptyList());
+
+                    final List<String> befores = containers.stream()
+                            .map(TestResultContainer::getBefores)
+                            .flatMap(Collection::stream)
+                            .map(fr -> fr.getName() + " [ " + printSteps(fr) + " ] ")
+                            .sorted()
+                            .collect(Collectors.toList());
+
+
+                    final List<String> afters = containers.stream()
+                            .map(TestResultContainer::getAfters)
+                            .flatMap(Collection::stream)
+                            .map(fr -> fr.getName() + " [ " + printSteps(fr) + " ] ")
+                            .sorted()
+                            .collect(Collectors.toList());
+
+                    return Triple.of(tr.getName(), befores, afters);
+                })
+                .collect(Collectors.toList());
+
+    }
+
+    @Test
+    void shouldNotMixUpFixturesBetweenTests() {
+        final AllureResults results = runClasses(OneTest.class, SpecFixtures.class);
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, this::printSteps)
+                .containsExactlyInAnyOrder(
+                        tuple("Simple Test", "expect"),
+                        tuple("test with spec fixtures", "expect then and when given: the end")
+                );
+
+        final List<Triple<String, List<String>, List<String>>> trFixtures = getTrFixtures(results);
+
+        assertThat(trFixtures)
+                .extracting(Triple::getLeft, Triple::getMiddle, Triple::getRight)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Simple Test",
+                                Collections.singletonList("setup [ OneTest#setup ] "),
+                                Collections.emptyList()
+                        ),
+                        tuple(
+                                "test with spec fixtures",
+                                Collections.singletonList("setup spec [ SpecFixtures#setupSpec ] "),
+                                Collections.singletonList("cleanup spec [ SpecFixtures#cleanupSpec ] ")
+                        )
+                );
+    }
+
+    private final TestPlanV1_0.TestCase onlyId2 = new TestPlanV1_0.TestCase().setId("2");
+    private final TestPlanV1_0.TestCase onlyId4 = new TestPlanV1_0.TestCase().setId("4");
+
+    private final TestPlanV1_0.TestCase test1 = new TestPlanV1_0.TestCase().setId("1")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 1");
+    private final TestPlanV1_0.TestCase test2 = new TestPlanV1_0.TestCase()
+            .setId("2")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 2");
+    private final TestPlanV1_0.TestCase test3 = new TestPlanV1_0.TestCase()
+            .setId("3")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 3");
+
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelector = new TestPlanV1_0.TestCase()
+            .setId("4")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter_bla.test 3");
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelectorFailed = new TestPlanV1_0.TestCase()
+            .setId("6")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter_bla.test 3");
+    private final TestPlanV1_0.TestCase otherId = new TestPlanV1_0.TestCase().setId("4")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 1");
+    private final TestPlanV1_0.TestCase ignored = new TestPlanV1_0.TestCase().setId("5")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test 5");
+
+    @Test
+    @AllureFeatures.Filtration
+    public void simpleFiltration() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, test2, test3));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED),
+                        tuple("test 2", Status.PASSED),
+                        tuple("test 3", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void onlyId() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(onlyId2, onlyId4));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 4", Status.PASSED),
+                        tuple("test 2", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void idAssignToOtherTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Collections.singletonList(otherId));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED),
+                        tuple("test 4", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void skippedTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, ignored));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void correctIdIncorrectSelector() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(
+                Arrays.asList(test1, test2, correctIdIncorrectSelector, correctIdIncorrectSelectorFailed)
+        );
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+        assertThat(testResults)
+                .hasSize(4)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED),
+                        tuple("test 2", Status.PASSED),
+                        tuple("test 4", Status.PASSED),
+                        tuple("test 6", Status.FAILED)
+                );
+    }
+
+    @Step("Run classes {classes}")
+    public static AllureResults runClasses(final Class<?>... classes) {
+        return runClasses(null, classes);
+    }
+
+    @Step("Run classes {classes}")
+    public static AllureResults runClasses(final TestPlan testPlan, final Class<?>... classes) {
+        return RunUtils.runTests(lifecycle -> {
+            final ClassSelector[] classSelectors = Stream.of(classes)
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
+
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .selectors(classSelectors)
+                    .build();
+
+            final RunContext context = RunContext.get();
+            final GlobalExtensionRegistry extensionRegistry = ReflectionUtils
+                    .tryToReadFieldValue(RunContext.class, "globalExtensionRegistry", context)
+                    .andThenTry(GlobalExtensionRegistry.class::cast)
+                    .toOptional()
+                    .orElseThrow(() -> new AssertionError("could not access globalExtensionRegistry field of RunContext"));
+            extensionRegistry.getGlobalExtensions().add(new AllureSpock2(lifecycle, testPlan));
+
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestEngineAutoRegistration(false)
+                    .addTestEngines(new SpockEngine())
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .enablePostDiscoveryFilterAutoRegistration(false)
+                    .build();
+
+            final Launcher launcher = LauncherFactory.create(config);
+            launcher.execute(request);
+        });
+    }
+
+    private String printSteps(final ExecutableItem item) {
+        return item.getSteps().stream()
+                .map(StepResult::getName)
+                .collect(Collectors.joining(", "));
+    }
+
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
new file mode 100644
index 000000000..722cdc975
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
@@ -0,0 +1,29 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class BrokenTest extends Specification {
+
+    def "brokenTest"() throws Exception {
+        expect:
+        throw new RuntimeException("Hello, everybody")
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
new file mode 100644
index 000000000..8a7a62afd
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class DataDrivenTest extends Specification {
+
+    def "Simple Test"() {
+        expect:
+        Math.max(a, b) == c
+
+        where:
+        a | b || c
+        1 | 3 || 3
+        7 | 4 || 7
+        0 | 0 || 0
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
new file mode 100644
index 000000000..b690390b2
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
@@ -0,0 +1,42 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import io.qameta.allure.*
+import spock.lang.Specification
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class FailedTest extends Specification {
+
+    @Links([
+            @Link("link-1"),
+            @Link("link-2")
+    ])
+    @Issues([
+            @Issue("issue-1"),
+            @Issue("issue-2")
+    ])
+    @TmsLinks([
+            @TmsLink("tms-1"),
+            @TmsLink("tms-2")
+    ])
+    def "failedTest"() {
+        expect:
+        false
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
new file mode 100644
index 000000000..581241776
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
@@ -0,0 +1,57 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+
+import spock.lang.Specification
+
+import static io.qameta.allure.Allure.step
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class FixturesTest extends Specification {
+
+    def setupSpec() {
+        step "setupSpec step 1"
+        step "setupSpec step 2"
+    }
+
+    def cleanupSpec() {
+        step "cleanupSpec step 1"
+        step "cleanupSpec step 2"
+    }
+
+    def setup() {
+        step "setup step 1"
+        step "setup step 2"
+    }
+
+    def cleanup() {
+        step "cleanup step 1"
+        step "cleanup step 2"
+    }
+
+    def "First Test"() {
+        expect:
+        true
+    }
+
+    def "Second Test"() {
+        expect:
+        true
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
new file mode 100644
index 000000000..890d8aca1
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+
+class HelloSpockSpec extends Specification {
+  def "length of Spock's and his friends' names"() {
+    expect:
+    name.size() == length
+
+    where:
+    name     | length
+    "Spock"  | 5
+    "Kirk"   | 4
+    "Scotty" | 6
+  }
+}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
similarity index 54%
rename from allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
rename to allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
index 1d0c86e75..3ae0b7f34 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,27 +13,25 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package ru.yandex.qatools.allure.annotations;
+package io.qameta.allure.spock2.samples
 
-import ru.yandex.qatools.allure.model.SeverityLevel;
+import io.qameta.allure.LabelAnnotation
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.Documented
+import java.lang.annotation.ElementType
+import java.lang.annotation.Inherited
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
 
 /**
- * Each test has severity level. You can change test case severity
- * label using this annotation.
- *
- * @see ru.yandex.qatools.allure.model.SeverityLevel
+ * @author vbragin
  */
 @Documented
+@Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface Severity {
-
-    SeverityLevel value();
-
+@LabelAnnotation(name = "jira")
+@interface JiraIssue {
+    String value();
 }
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/DatatableFeatureSteps.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
similarity index 67%
rename from allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/DatatableFeatureSteps.java
rename to allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
index 5085334e0..27e7e70dd 100644
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/DatatableFeatureSteps.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,19 +13,23 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm.samples;
+package io.qameta.allure.spock2.samples
 
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
+import spock.lang.Specification
+
+import static io.qameta.allure.Allure.step
 
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unused")
-public class DatatableFeatureSteps {
+class OneTest extends Specification {
 
-    @Given("^users are:$")
-    public void usersAre(DataTable table) {
+    def setup() {
+        step "OneTest#setup"
     }
 
+    def "Simple Test"() {
+        expect:
+        true
+    }
 }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
new file mode 100644
index 000000000..d5b4f5beb
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class ParametersTest extends Specification {
+
+    def "Simple Test"() {
+        expect:
+        Math.max(a, b) == c
+
+        where:
+        a | b || c
+        1 | 3 || 3
+    }
+}
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BackgroundFeatureSteps.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
similarity index 57%
rename from allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BackgroundFeatureSteps.java
rename to allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
index 4597729c8..3884e6fed 100644
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BackgroundFeatureSteps.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,31 +13,32 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumberjvm.samples;
+package io.qameta.allure.spock2.samples
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import spock.lang.Specification
+
+import static io.qameta.allure.Allure.step
 
 /**
  * @author charlie (Dmitry Baev).
  */
-public class BackgroundFeatureSteps {
-
-    @Given("^cat is sad$")
-    public void catIsSad() {
-    }
+class SpecFixtures extends Specification {
 
-    @Given("^cat is murmur$")
-    public void catIsMurMur() {
+    def setupSpec() {
+        step "SpecFixtures#setupSpec"
     }
 
-    @When("^pet the cat$")
-    public void petTheCat() {
+    def cleanupSpec() {
+        step "SpecFixtures#cleanupSpec"
     }
 
-    @Then("^cat is happy$")
-    public void catIsHappy() {
+    def "test with spec fixtures"() {
+        given:
+        when:
+        and:
+        then:
+        expect:
+        "the end"
     }
 
 }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
new file mode 100644
index 000000000..41a1ef57f
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
@@ -0,0 +1,50 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+
+import static io.qameta.allure.Allure.step
+
+abstract class BaseSpec extends Specification {
+    def setupSpec() { step 'base setupSpec()' }
+
+    def cleanupSpec() { step 'base cleanupSpec()' }
+
+    def setup() { step 'base setup()' }
+
+    def cleanup() { step 'base cleanup()' }
+
+    def baseSpecMethod() {
+        setup:
+        step 'base spec method'
+    }
+}
+
+class DerivedSpec extends BaseSpec {
+    def setupSpec() { step 'derived setupSpec()' }
+
+    def cleanupSpec() { step 'derived cleanupSpec()' }
+
+    def setup() { step 'derived setup()' }
+
+    def cleanup() { step 'derived cleanup()' }
+
+    def derivedSpecMethod() {
+        setup:
+        step 'derived spec method'
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
new file mode 100644
index 000000000..25940b3c1
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+import spock.lang.Tag
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class SpockTags extends Specification {
+
+    @Tag("first")
+    @Tag("second")
+    def "someTest"() {
+        expect:
+        true
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
new file mode 100644
index 000000000..2aed57c68
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import io.qameta.allure.Step
+import spock.lang.Specification
+
+import static io.qameta.allure.Allure.step
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+
+class StepsAndBlocks extends Specification {
+
+    def "test with steps and blocks"() {
+        given: "asd"
+        step "step1"
+        step "step2"
+        "step some"()
+        when:
+        step "step3"
+        step "step4"
+        then:
+        step "step5"
+        step "step6"
+    }
+
+    @Step
+    def "step some"() {
+        step "yaaa"
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
new file mode 100644
index 000000000..8f1a4b46e
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
@@ -0,0 +1,48 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import io.qameta.allure.*
+import spock.lang.Specification
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class TestWithAnnotations extends Specification {
+
+    @Epic("epic1")
+    @Epics([
+            @Epic("epic2"),
+            @Epic("epic3")
+    ])
+    @Features([
+            @Feature("feature1"),
+            @Feature("feature2")
+    ])
+    @Feature("feature3")
+    @Story("story1")
+    @Stories([
+            @Story("story2"),
+            @Story("story3")]
+    )
+    @Owner("some-owner")
+    @Flaky
+    @Muted
+    def "someTest"() {
+        expect:
+        true
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
new file mode 100644
index 000000000..58347d7b2
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
@@ -0,0 +1,48 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import io.qameta.allure.*
+import spock.lang.Specification
+
+/**
+ * @author vbragin
+ */
+@Epic("epic1")
+@Features([
+        @Feature("feature1"),
+        @Feature("feature2")
+])
+@Feature("feature3")
+@Story("story1")
+@Stories([
+        @Story("story2"),
+        @Story("story3")]
+)
+class TestWithAnnotationsOnClass extends Specification {
+
+    @Flaky
+    @Epics([
+            @Epic("epic2"),
+            @Epic("epic3")
+    ])
+    @Muted
+    @Owner("some-owner")
+    def "someTest"() {
+        expect:
+        true
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
new file mode 100644
index 000000000..a535ba9c4
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import io.qameta.allure.Epic
+import io.qameta.allure.Feature
+import io.qameta.allure.Story
+import spock.lang.Specification
+
+/**
+ * @author vbragin
+ */
+class TestWithCustomAnnotations extends Specification {
+
+    @Epic("epic")
+    @Feature("feature")
+    @Story("story")
+    @JiraIssue("AS-1")
+    @XrayId("XRT-1")
+    def "someTest"() {
+        expect:
+        true
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
new file mode 100644
index 000000000..c80c9e4ab
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+
+import static io.qameta.allure.Allure.step
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class TestWithSteps extends Specification {
+
+    def "testWithSteps"() {
+        expect:
+        step "step1"
+        step "step2"
+        step "step3"
+    }
+}
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
new file mode 100644
index 000000000..64ae85712
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
@@ -0,0 +1,60 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Ignore;
+
+import io.qameta.allure.AllureId;
+import spock.lang.Specification;
+
+class TestsWithIdForFilter extends Specification {
+
+    @AllureId("1")
+    def "test 1"() {
+        expect:
+        true
+    }
+
+    @AllureId("2")
+    def "test 2"() {
+        expect:
+        true
+    }
+
+    def "test 3"() {
+        expect:
+        true
+    }
+
+    @AllureId("4")
+    def "test 4"() {
+        expect:
+        true
+    }
+
+    @Ignore
+    @AllureId("5")
+    def "test 5"() {
+        expect:
+        true
+    }
+
+    @AllureId("6")
+    def "test 6"() {
+        expect:
+        false
+    }
+}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
similarity index 54%
rename from allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
rename to allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
index 82e0af871..ac88117c5 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,28 +13,25 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package ru.yandex.qatools.allure.annotations;
+package io.qameta.allure.spock2.samples
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import io.qameta.allure.LabelAnnotation
+
+import java.lang.annotation.Documented
+import java.lang.annotation.ElementType
+import java.lang.annotation.Inherited
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
 
 /**
- * Use this annotation to link a single issue from issue tracker to test cases and test suites. Usage:
- * <pre>
- * &#064;Issue("MYPROJECT-1")
- * public void myTest() {
- *     ...
- * }
- * </pre>
+ * @author vbragin
  */
 @Documented
+@Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Issue {
-
+@Target(ElementType.METHOD)
+@LabelAnnotation(name = "xray")
+@interface XrayId {
     String value();
-
 }
diff --git a/allure-spock2/src/test/resources/allure.properties b/allure-spock2/src/test/resources/allure.properties
new file mode 100644
index 000000000..9c0b0a2d7
--- /dev/null
+++ b/allure-spock2/src/test/resources/allure.properties
@@ -0,0 +1,2 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts
index 2ddeedc08..b79566812 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -1,13 +1,10 @@
 description = "Allure Spring Web Integration"
 
-val agent: Configuration by configurations.creating
-
-val springWebVersion = "5.1.4.RELEASE"
+val springWebVersion = "6.2.12"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
-    implementation("org.springframework:spring-web:$springWebVersion")
+    compileOnly("org.springframework:spring-web:$springWebVersion")
     testImplementation("com.github.tomakehurst:wiremock")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
@@ -15,6 +12,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.springframework:spring-web:$springWebVersion")
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
@@ -30,7 +28,8 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
+
+tasks.compileJava {
+    options.release.set(17)
+}
\ No newline at end of file
diff --git a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
index 5474a8137..2c302b0ed 100644
--- a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
+++ b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import io.qameta.allure.attachment.AttachmentData;
 import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
@@ -42,6 +43,14 @@ public class AllureRestTemplate implements ClientHttpRequestInterceptor {
     private String requestTemplatePath = "http-request.ftl";
     private String responseTemplatePath = "http-response.ftl";
 
+    public String getRequestTemplatePath() {
+        return requestTemplatePath;
+    }
+
+    public String getResponseTemplatePath() {
+        return responseTemplatePath;
+    }
+
     public AllureRestTemplate setRequestTemplate(final String templatePath) {
         this.requestTemplatePath = templatePath;
         return this;
@@ -52,37 +61,49 @@ public AllureRestTemplate setResponseTemplate(final String templatePath) {
         return this;
     }
 
+    protected AttachmentRenderer<AttachmentData> getRequestRenderer() {
+        return new FreemarkerAttachmentRenderer(getRequestTemplatePath());
+    }
+
+    protected AttachmentRenderer<AttachmentData> getResponseRenderer() {
+        return new FreemarkerAttachmentRenderer(getResponseTemplatePath());
+    }
+
+    protected AttachmentProcessor<AttachmentData> getAttachmentProcessor() {
+        return new DefaultAttachmentProcessor();
+    }
+
     @SuppressWarnings("NullableProblems")
     @Override
     public ClientHttpResponse intercept(@NonNull final HttpRequest request, final byte[] body,
                                         @NonNull final ClientHttpRequestExecution execution) throws IOException {
-        final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
+        final AttachmentProcessor<AttachmentData> processor = getAttachmentProcessor();
 
         final HttpRequestAttachment.Builder requestAttachmentBuilder = HttpRequestAttachment.Builder
                 .create("Request", request.getURI().toString())
-                .setMethod(request.getMethodValue())
+                .setMethod(request.getMethod().name())
                 .setHeaders(toMapConverter(request.getHeaders()));
         if (body.length != 0) {
             requestAttachmentBuilder.setBody(new String(body, StandardCharsets.UTF_8));
         }
 
         final HttpRequestAttachment requestAttachment = requestAttachmentBuilder.build();
-        processor.addAttachment(requestAttachment, new FreemarkerAttachmentRenderer(requestTemplatePath));
+        processor.addAttachment(requestAttachment, getRequestRenderer());
 
         final ClientHttpResponse clientHttpResponse = execution.execute(request, body);
 
         final HttpResponseAttachment responseAttachment = HttpResponseAttachment.Builder
                 .create("Response")
-                .setResponseCode(clientHttpResponse.getRawStatusCode())
+                .setResponseCode(clientHttpResponse.getStatusCode().value())
                 .setHeaders(toMapConverter(clientHttpResponse.getHeaders()))
                 .setBody(StreamUtils.copyToString(clientHttpResponse.getBody(), StandardCharsets.UTF_8))
                 .build();
-        processor.addAttachment(responseAttachment, new FreemarkerAttachmentRenderer(responseTemplatePath));
+        processor.addAttachment(responseAttachment, getResponseRenderer());
 
         return clientHttpResponse;
     }
 
-    private static Map<String, String> toMapConverter(final Map<String, List<String>> items) {
+    protected static Map<String, String> toMapConverter(final Map<String, List<String>> items) {
         final Map<String, String> result = new HashMap<>();
         items.forEach((key, value) -> result.put(key, String.join("; ", value)));
         return result;
diff --git a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
index 8da4532dc..3911b640f 100644
--- a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
+++ b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/build.gradle.kts b/allure-test-filter/build.gradle.kts
new file mode 100644
index 000000000..b2198ce39
--- /dev/null
+++ b/allure-test-filter/build.gradle.kts
@@ -0,0 +1,71 @@
+plugins {
+    id("io.github.goooler.shadow")
+}
+
+description = "Allure Test Filter"
+
+dependencies {
+    implementation(project(":allure-java-commons"))
+    internal("com.fasterxml.jackson.core:jackson-databind")
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+configurations.forEach { configuration ->
+    configuration.outgoing.apply {
+        val removed = artifacts.removeAll { it.classifier.isNullOrEmpty() }
+        if (removed) {
+            artifact(tasks.shadowJar) {
+                classifier = ""
+            }
+        }
+    }
+}
+
+tasks {
+    jar {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+
+    shadowJar {
+        archiveClassifier.set("")
+        relocate("com.fasterxml.jackson", "io.qameta.allure.internal.shadowed.jackson")
+        dependencies {
+            // we only need relocate to use jackson, shadowed in allure-java-commons
+            include(dependency("x:x:x"))
+        }
+        mergeServiceFiles()
+        manifest {
+            attributes(mapOf(
+                    "Specification-Title" to project.name,
+                    "Implementation-Title" to project.name,
+                    "Implementation-Version" to project.version,
+                    "Automatic-Module-Name" to "io.qameta.allure.testfilter"
+            ))
+        }
+        from("src/main/services") {
+            into("META-INF/services")
+        }
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+
+    test {
+        dependsOn(shadowJar)
+        systemProperty("junit.jupiter.execution.parallel.enabled", "false")
+        useJUnitPlatform()
+        exclude("**/features/*")
+    }
+}
+
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
new file mode 100644
index 000000000..5587bbf3c
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testfilter;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * The {@link TestPlanSupplier} that reads test plan from file, specified
+ * in {@code ALLURE_TESTPLAN_PATH} environment variable.
+ *
+ * @author charlie (Dmitry Baev).
+ */
+public class FileTestPlanSupplier implements TestPlanSupplier {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileTestPlanSupplier.class);
+
+    /**
+     * The possible environment variable names.
+     */
+    private static final String[] ENV_TESTPLAN_PATH = {"ALLURE_TESTPLAN_PATH", "AS_TESTPLAN_PATH"};
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+
+    /**
+     * Supply test plan.
+     *
+     * @return the test plan.
+     */
+    @Override
+    public Optional<TestPlan> supply() {
+        final Optional<String> testPlanPath = Arrays.stream(ENV_TESTPLAN_PATH)
+                .map(System::getenv)
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .findFirst();
+
+        return testPlanPath
+                .flatMap(this::tryGetPath)
+                .filter(Files::exists)
+                .filter(Files::isRegularFile)
+                .flatMap(this::readTestPlan);
+    }
+
+    private Optional<TestPlan> readTestPlan(final Path path) {
+        try (InputStream stream = Files.newInputStream(path)) {
+            return Optional.of(OBJECT_MAPPER.readValue(stream, TestPlan.class));
+        } catch (IOException e) {
+            LOGGER.warn("could not read test plan file {}", path, e);
+            return Optional.empty();
+        }
+    }
+
+    private Optional<Path> tryGetPath(final String path) {
+        try {
+            return Optional.of(Paths.get(path));
+        } catch (Exception e) {
+            LOGGER.warn("could not read test plan file {}: invalid path", path);
+            return Optional.empty();
+        }
+    }
+
+}
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
new file mode 100644
index 000000000..64bad2ebd
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testfilter;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+/**
+ * Common interface for all test plan implementations.
+ *
+ * @author charlie (Dmitry Baev).
+ */
+@JsonTypeInfo(
+        use = JsonTypeInfo.Id.NAME,
+        property = "version",
+        defaultImpl = TestPlanUnknown.class
+)
+@JsonSubTypes({
+        @JsonSubTypes.Type(TestPlanV1_0.class)
+})
+public interface TestPlan {
+}
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
new file mode 100644
index 000000000..bbd53e1cd
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testfilter;
+
+import java.util.Optional;
+
+/**
+ * Marker interface for all test plan suppliers.
+ *
+ * @author charlie (Dmitry Baev).
+ */
+@FunctionalInterface
+public interface TestPlanSupplier {
+
+    /**
+     * Supply test plan.
+     *
+     * @return the test plan.
+     */
+    Optional<TestPlan> supply();
+
+}
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
new file mode 100644
index 000000000..fd4720302
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
@@ -0,0 +1,27 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testfilter;
+
+import java.io.Serializable;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class TestPlanUnknown implements TestPlan, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+}
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
new file mode 100644
index 000000000..2ccd7b413
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
@@ -0,0 +1,127 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testfilter;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@JsonTypeName("1.0")
+@SuppressWarnings({"TypeName"})
+public class TestPlanV1_0 implements TestPlan, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * List of tests to run.
+     */
+    private List<TestCase> tests;
+
+    /**
+     * Gets the value of the tests property.
+     *
+     * @return tests.
+     */
+    public List<TestCase> getTests() {
+        return tests;
+    }
+
+    /**
+     * Sets the value of the tests property.
+     *
+     * @param tests the value to set.
+     * @return current instance.
+     */
+    public TestPlanV1_0 setTests(final List<TestCase> tests) {
+        this.tests = tests;
+        return this;
+    }
+
+    /**
+     * @param allureId value of @AllureId annotation, if not set pass null value
+     * @param selector selector of test method
+     * @return true if test case with given allureId or selection is selected, false otherwise.
+     */
+    public boolean isSelected(final String allureId, final String selector) {
+        return getTests().stream().map(test -> new String[]{test.getId(), test.getSelector()})
+                .flatMap(array -> Arrays.stream(array).filter(Objects::nonNull))
+                .anyMatch(item -> item.equals(selector) || item.equals(allureId));
+    }
+
+    /**
+     * Test plan test case. At least one of {@link #id} and {@link #selector} should be specified.
+     */
+    public static class TestCase implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Test case id. Can be specified by providing {@code AS_ID} label.
+         */
+        private String id;
+
+        /**
+         * Selector that can be used to run test case. Some sort of unique id or full name of test.
+         */
+        private String selector;
+
+        /**
+         * Gets the value of the id property.
+         *
+         * @return id
+         */
+        public String getId() {
+            return id;
+        }
+
+        /**
+         * Sets the value of the id property.
+         *
+         * @param id the id to set.
+         * @return current instance.
+         */
+        public TestCase setId(final String id) {
+            this.id = id;
+            return this;
+        }
+
+        /**
+         * Gets the value of the selector property.
+         *
+         * @return id
+         */
+        public String getSelector() {
+            return selector;
+        }
+
+        /**
+         * Sets the value of the selector property.
+         *
+         * @param selector the selector to set.
+         * @return current instance.
+         */
+        public TestCase setSelector(final String selector) {
+            this.selector = selector;
+            return this;
+        }
+    }
+}
diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index dd43d7ecf..7d6fe56a7 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -1,18 +1,18 @@
-description = "Allure TestNG Integration"
+description = "Allure TestNG 7 Integration"
 
-val agent: Configuration by configurations.creating
-
-val testNgVersion = "6.14.3"
+val testNgVersion = "7.11.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("org.testng:testng:$testNgVersion")
+    compileOnly("org.testng:testng:$testNgVersion")
+    implementation(project(":allure-test-filter"))
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("com.google.inject:guice")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.testng:testng:$testNgVersion")
     testImplementation(project(":allure-java-commons-test"))
 }
 
@@ -32,19 +32,21 @@ tasks.test {
         suites("src/test/resources/testng.xml")
     })
     exclude("**/samples/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
-val spiOffJar by tasks.creating(Jar::class) {
-    from(sourceSets.getByName("main").output)
-    classifier = "spi-off"
+tasks.withType(JavaCompile::class) {
+    options.release.set(11)
 }
 
-val spiOff by configurations.creating {
-    extendsFrom(configurations.getByName("compile"))
+val spiOffJar: Jar by tasks.creating(Jar::class) {
+    from(sourceSets.getByName("main").output)
+    archiveClassifier.set("spi-off")
 }
 
-artifacts.add("archives", spiOffJar)
-artifacts.add("spiOff", spiOffJar)
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
+}
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index f296ad9ca..41b7c362c 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.testng.config.AllureTestNgConfig;
 import io.qameta.allure.util.AnnotationUtils;
 import io.qameta.allure.util.ObjectUtils;
 import io.qameta.allure.util.ResultsUtils;
@@ -40,6 +41,8 @@
 import org.testng.IConfigurationListener;
 import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
 import org.testng.ISuite;
 import org.testng.ISuiteListener;
 import org.testng.ITestClass;
@@ -59,10 +62,12 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -71,6 +76,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.bytesToHex;
 import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
 import static io.qameta.allure.util.ResultsUtils.createHostLabel;
@@ -96,61 +102,110 @@
  * Allure TestNG listener.
  */
 @SuppressWarnings({
-        "PMD.ExcessiveImports", "PMD.TooManyMethods", "PMD.GodClass",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling", "PMD.ExcessiveClassLength"
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
 })
 public class AllureTestNg implements
         ISuiteListener,
         ITestListener,
         IInvokedMethodListener,
-        IConfigurationListener {
+        IConfigurationListener,
+        IMethodInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureTestNg.class);
 
     private static final String ALLURE_UUID = "ALLURE_UUID";
+    private static final List<Class<?>> INJECTED_TYPES = Arrays.asList(
+            ITestContext.class, ITestResult.class, XmlTest.class, Method.class, Object[].class
+    );
+
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
 
     /**
      * Store current testng result uuid to attach before/after methods into.
      */
     private final ThreadLocal<Current> currentTestResult = ThreadLocal
             .withInitial(Current::new);
-
     /**
      * Store current container uuid for fake containers around before/after methods.
      */
     private final ThreadLocal<String> currentTestContainer = ThreadLocal
             .withInitial(() -> UUID.randomUUID().toString());
-
     /**
      * Store uuid for current executable item to catch steps and attachments.
      */
     private final ThreadLocal<String> currentExecutable = ThreadLocal
             .withInitial(() -> UUID.randomUUID().toString());
-
     /**
      * Store uuid for class test containers.
      */
     private final Map<ITestClass, String> classContainerUuidStorage = new ConcurrentHashMap<>();
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
+    private final AllureLifecycle lifecycle;
+    private final AllureTestNgTestFilter testFilter;
 
-    private static final List<Class<?>> INJECTED_TYPES = Arrays.asList(
-            ITestContext.class, ITestResult.class, XmlTest.class, Method.class, Object[].class
-    );
+    private final AllureTestNgConfig config;
 
-    private final AllureLifecycle lifecycle;
+    /**
+     * Package private constructor to allow custom configurations for unit tests.
+     */
+    AllureTestNg(final AllureLifecycle lifecycle,
+                 final AllureTestNgTestFilter testFilter,
+                 final AllureTestNgConfig config) {
+        this.lifecycle = lifecycle;
+        this.testFilter = testFilter;
+        this.config = config;
+    }
 
-    public AllureTestNg(final AllureLifecycle lifecycle) {
+    public AllureTestNg(final AllureLifecycle lifecycle,
+                        final AllureTestNgTestFilter testFilter) {
         this.lifecycle = lifecycle;
+        this.testFilter = testFilter;
+        this.config = AllureTestNgConfig.loadConfigProperties();
+    }
+
+    public AllureTestNg(final AllureLifecycle lifecycle) {
+        this(lifecycle, new AllureTestNgTestFilter());
     }
 
     public AllureTestNg() {
-        this.lifecycle = Allure.getLifecycle();
+        this(Allure.getLifecycle());
+    }
+
+    private static String safeExtractSuiteName(final ITestClass testClass) {
+        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
+        return xmlTest.map(XmlTest::getSuite).map(XmlSuite::getName).orElse("Undefined suite");
+    }
+
+    private static String safeExtractTestTag(final ITestClass testClass) {
+        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
+        return xmlTest.map(XmlTest::getName).orElse("Undefined testng tag");
+    }
+
+    private static String safeExtractTestClassName(final ITestClass testClass) {
+        return firstNonEmpty(testClass.getTestName(), testClass.getName()).orElse("Undefined class name");
     }
 
     public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
 
+    @Override
+    public List<IMethodInstance> intercept(final List<IMethodInstance> methods,
+                                           final ITestContext context) {
+        return testFilter.intercept(methods, context);
+    }
+
     @Override
     public void onStart(final ISuite suite) {
         final TestResultContainer result = new TestResultContainer()
@@ -175,10 +230,13 @@ public void onStart(final ITestContext context) {
                 .distinct()
                 .forEach(this::onBeforeClass);
 
-        context.getExcludedMethods().stream()
-                .filter(ITestNGMethod::isTest)
-                .filter(method -> !method.getEnabled())
-                .forEach(method -> createFakeResult(context, method));
+        if (!config.isHideDisabledTests()) {
+            context.getExcludedMethods().stream()
+                    .filter(ITestNGMethod::isTest)
+                    .filter(method -> !method.getEnabled())
+                    .filter(testFilter::isSelected)
+                    .forEach(method -> createFakeResult(context, method));
+        }
     }
 
     protected void createFakeResult(final ITestContext context, final ITestNGMethod method) {
@@ -226,6 +284,10 @@ public void onAfterClass(final ITestClass testClass) {
 
     @Override
     public void onTestStart(final ITestResult testResult) {
+        if (shouldSkipReportingFor(testResult)) {
+            return;
+        }
+
         Current current = currentTestResult.get();
         if (current.isStarted()) {
             current = refreshContext();
@@ -242,6 +304,25 @@ public void onTestStart(final ITestResult testResult) {
                 .ifPresent(clazz -> addClassContainerChild(clazz, uuid));
     }
 
+    @SuppressWarnings("BooleanExpressionComplexity")
+    protected boolean shouldSkipReportingFor(final ITestResult testResult) {
+        final String[] groups = Optional.of(testResult)
+                .map(ITestResult::getMethod)
+                .map(ITestNGMethod::getGroups)
+                .orElseGet(() -> new String[]{});
+
+        if (groups.length == 0) {
+            return false;
+        }
+
+        final Set<String> groupsSet = new HashSet<>(Arrays.asList(groups));
+        return (HAS_CUCUMBERJVM7_IN_CLASSPATH
+                || HAS_CUCUMBERJVM6_IN_CLASSPATH
+                || HAS_CUCUMBERJVM5_IN_CLASSPATH
+                || HAS_CUCUMBERJVM4_IN_CLASSPATH
+               ) && groupsSet.contains("cucumber");
+    }
+
     protected void startTestCase(final ITestResult testResult,
                                  final String parentUuid,
                                  final String uuid) {
@@ -255,7 +336,7 @@ protected void startTestCase(final ITestResult testResult,
         );
     }
 
-    @SuppressWarnings({"Indentation", "PMD.ExcessiveMethodLength", "deprecation"})
+    @SuppressWarnings({"Indentation"})
     protected void startTestCase(final ITestContext context,
                                  final ITestNGMethod method,
                                  final IClass iClass,
@@ -296,13 +377,24 @@ protected void startTestCase(final ITestContext context,
                 .setParameters(parameters)
                 .setLinks(getLinks(method, iClass))
                 .setLabels(labels);
-        processDescription(getClass().getClassLoader(), method.getConstructorOrMethod().getMethod(), result);
+
+        processDescription(
+                getClass().getClassLoader(),
+                method.getConstructorOrMethod().getMethod(),
+                result::setDescription,
+                result::setDescriptionHtml
+        );
+
         getLifecycle().scheduleTestCase(parentUuid, result);
         getLifecycle().startTestCase(uuid);
     }
 
     @Override
     public void onTestSuccess(final ITestResult testResult) {
+        if (shouldSkipReportingFor(testResult)) {
+            return;
+        }
+
         final Current current = currentTestResult.get();
         current.after();
         getLifecycle().updateTestCase(current.getUuid(), setStatus(Status.PASSED));
@@ -312,6 +404,10 @@ public void onTestSuccess(final ITestResult testResult) {
 
     @Override
     public void onTestFailure(final ITestResult result) {
+        if (shouldSkipReportingFor(result)) {
+            return;
+        }
+
         Current current = currentTestResult.get();
 
         if (current.isAfter()) {
@@ -340,6 +436,10 @@ protected void stopTestCase(final String uuid, final Throwable throwable, final
 
     @Override
     public void onTestSkipped(final ITestResult result) {
+        if (shouldSkipReportingFor(result)) {
+            return;
+        }
+
         Current current = currentTestResult.get();
 
         //testng is being skipped as dependent on failed testng, closing context for previous testng here
@@ -377,7 +477,6 @@ public void beforeInvocation(final IInvokedMethod method, final ITestResult test
         }
     }
 
-
     private void ifSuiteFixtureStarted(final ISuite suite, final ITestNGMethod testMethod) {
         if (testMethod.isBeforeSuiteConfiguration()) {
             startBefore(getUniqueUuid(suite), testMethod);
@@ -451,14 +550,19 @@ private String getQualifiedName(final ITestNGMethod method) {
         return method.getRealClass().getName() + "." + method.getMethodName();
     }
 
-    @SuppressWarnings("deprecation")
     private FixtureResult getFixtureResult(final ITestNGMethod method) {
         final FixtureResult fixtureResult = new FixtureResult()
-                .withName(getMethodName(method))
-                .withStart(System.currentTimeMillis())
-                .withDescription(method.getDescription())
-                .withStage(Stage.RUNNING);
-        processDescription(getClass().getClassLoader(), method.getConstructorOrMethod().getMethod(), fixtureResult);
+                .setName(getMethodName(method))
+                .setStart(System.currentTimeMillis())
+                .setDescription(method.getDescription())
+                .setStage(Stage.RUNNING);
+
+        processDescription(
+                getClass().getClassLoader(),
+                method.getConstructorOrMethod().getMethod(),
+                fixtureResult::setDescription,
+                fixtureResult::setDescriptionHtml
+        );
         return fixtureResult;
     }
 
@@ -494,12 +598,27 @@ public void onConfigurationSuccess(final ITestResult itr) {
 
     @Override
     public void onConfigurationFailure(final ITestResult itr) {
+        if (config.isHideConfigurationFailures()) {
+            return; //do nothing
+        }
+
         final String uuid = UUID.randomUUID().toString();
         final String parentUuid = UUID.randomUUID().toString();
 
         startTestCase(itr, parentUuid, uuid);
+
+        addChildToContainer(getUniqueUuid(itr.getTestContext()), uuid);
+        addChildToContainer(getUniqueUuid(itr.getTestContext().getSuite()), uuid);
+        addClassContainerChild(itr.getMethod().getTestClass(), uuid);
+        // results created for configuration failure should not be considered as test cases.
+        getLifecycle().updateTestCase(
+                uuid,
+                tr -> tr.getLabels().add(
+                        new Label().setName(ALLURE_ID_LABEL_NAME).setValue("-1")
+                )
+        );
+
         stopTestCase(uuid, itr.getThrowable(), getStatus(itr.getThrowable()));
-        //do nothing
     }
 
     @Override
@@ -530,9 +649,9 @@ protected Status getStatus(final Throwable throwable) {
     @SuppressWarnings("BooleanExpressionComplexity")
     private boolean isSupportedConfigurationFixture(final ITestNGMethod testMethod) {
         return testMethod.isBeforeMethodConfiguration() || testMethod.isAfterMethodConfiguration()
-                || testMethod.isBeforeTestConfiguration() || testMethod.isAfterTestConfiguration()
-                || testMethod.isBeforeClassConfiguration() || testMethod.isAfterClassConfiguration()
-                || testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration();
+               || testMethod.isBeforeTestConfiguration() || testMethod.isAfterTestConfiguration()
+               || testMethod.isBeforeClassConfiguration() || testMethod.isAfterClassConfiguration()
+               || testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration();
     }
 
     private void validateContainerExists(final String fixtureName, final String containerUuid) {
@@ -619,20 +738,7 @@ private String getUniqueUuid(final IAttributes suite) {
         return Objects.toString(suite.getAttribute(ALLURE_UUID));
     }
 
-    private static String safeExtractSuiteName(final ITestClass testClass) {
-        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
-        return xmlTest.map(XmlTest::getSuite).map(XmlSuite::getName).orElse("Undefined suite");
-    }
-
-    private static String safeExtractTestTag(final ITestClass testClass) {
-        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
-        return xmlTest.map(XmlTest::getName).orElse("Undefined testng tag");
-    }
-
-    private static String safeExtractTestClassName(final ITestClass testClass) {
-        return firstNonEmpty(testClass.getTestName(), testClass.getName()).orElse("Undefined class name");
-    }
-
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
     private List<Parameter> getParameters(final ITestContext context,
                                           final ITestNGMethod method,
                                           final Object... parameters) {
@@ -722,12 +828,15 @@ private Consumer<TestResult> setStatus(final Status status, final StatusDetails
     }
 
     private void addClassContainerChild(final ITestClass clazz, final String childUuid) {
+        this.addChildToContainer(classContainerUuidStorage.get(clazz), childUuid);
+    }
+
+    private void addChildToContainer(final String containerUuid, final String childUuid) {
         lock.writeLock().lock();
         try {
-            final String parentUuid = classContainerUuidStorage.get(clazz);
-            if (nonNull(parentUuid)) {
+            if (nonNull(containerUuid)) {
                 getLifecycle().updateTestContainer(
-                        parentUuid,
+                        containerUuid,
                         container -> container.getChildren().add(childUuid)
                 );
             }
@@ -759,6 +868,24 @@ private Current refreshContext() {
         return currentTestResult.get();
     }
 
+    private static boolean isClassAvailableOnClasspath(final String clazz) {
+        try {
+            AllureTestNg.class.getClassLoader().loadClass(clazz);
+            return true;
+        } catch (Exception ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * The stage of current result context.
+     */
+    private enum CurrentStage {
+        BEFORE,
+        TEST,
+        AFTER
+    }
+
     /**
      * Describes current test result.
      */
@@ -792,12 +919,4 @@ public String getUuid() {
         }
     }
 
-    /**
-     * The stage of current result context.
-     */
-    private enum CurrentStage {
-        BEFORE,
-        TEST,
-        AFTER
-    }
 }
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
new file mode 100644
index 000000000..886f3e55e
--- /dev/null
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
@@ -0,0 +1,93 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng;
+
+import io.qameta.allure.AllureId;
+import io.qameta.allure.testfilter.FileTestPlanSupplier;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanUnknown;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
+import org.testng.ITestContext;
+import org.testng.ITestNGMethod;
+import org.testng.internal.ConstructorOrMethod;
+
+import java.lang.reflect.Method;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class AllureTestNgTestFilter implements IMethodInterceptor {
+
+    private final TestPlan testPlan;
+
+    public AllureTestNgTestFilter() {
+        this.testPlan = new FileTestPlanSupplier().supply().orElse(new TestPlanUnknown());
+    }
+
+    public AllureTestNgTestFilter(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+    }
+
+    @Override
+    public List<IMethodInstance> intercept(final List<IMethodInstance> methods,
+                                           final ITestContext context) {
+        return methods.stream()
+                .filter(this::isSelected)
+                .sorted(Comparator.comparing(
+                        IMethodInstance::getMethod,
+                        Comparator.nullsFirst(Comparator.comparingInt(
+                                ITestNGMethod::getPriority
+                        ))))
+                .collect(Collectors.toList());
+    }
+
+    public boolean isSelected(final IMethodInstance instance) {
+        return isSelected(instance.getMethod());
+    }
+
+    public boolean isSelected(final ITestNGMethod method) {
+        if (testPlan instanceof TestPlanV1_0) {
+            return isSelected(method, (TestPlanV1_0) testPlan);
+        } else {
+            return true;
+        }
+    }
+
+    public boolean isSelected(final ITestNGMethod testNGMethod, final TestPlanV1_0 testPlan) {
+        final Optional<Method> method = Optional.ofNullable(testNGMethod)
+                .map(ITestNGMethod::getConstructorOrMethod)
+                .map(ConstructorOrMethod::getMethod);
+
+        if (method.isPresent()) {
+            final String selector = getSelector(method.get());
+            final String allureId = method
+                    .filter(m -> m.isAnnotationPresent(AllureId.class))
+                    .map(m -> m.getAnnotation(AllureId.class))
+                    .map(AllureId::value).orElse(null);
+            return testPlan.isSelected(allureId, selector);
+        }
+        return false;
+    }
+
+    private String getSelector(final Method method) {
+        return String.format("%s.%s",
+                method.getDeclaringClass().getCanonicalName(),
+                method.getName());
+    }
+}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java b/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
similarity index 68%
rename from allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
rename to allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
index 3b43d7f23..b6ddaec1b 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,27 +13,28 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package ru.yandex.qatools.allure.annotations;
+package io.qameta.allure.testng;
+
+import io.qameta.allure.LabelAnnotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import static io.qameta.allure.util.ResultsUtils.TAG_LABEL_NAME;
+
 /**
- * Use this annotation to link a test method with a test case in Test Management System (TMS). Usage:
- * <pre>
- * &#064;TestCaseId("MYPROJECT-1")
- * public void myTest() {
- *     ...
- * }
- * </pre>
+ * @author neparij (Nikolay Laptev).
  */
-@Documented
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface TestCaseId {
+@Documented
+@Repeatable(Tags.class)
+@LabelAnnotation(name = TAG_LABEL_NAME)
+public @interface Tag {
 
     String value();
 
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java b/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
similarity index 69%
rename from allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
rename to allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
index cfc836e6b..2d1590102 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package ru.yandex.qatools.allure.annotations;
+package io.qameta.allure.testng;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -22,16 +22,13 @@
 import java.lang.annotation.Target;
 
 /**
- * Use this annotation to set test suite and test case title.
- * Title overrides default name in report.
- *
- * @author Dmitry Baev charlie@yandex-team.ru
- *         Date: 10.24.13
+ * @author neparij (Nikolay Laptev).
  */
-@Documented
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Title {
+@Documented
+public @interface Tags {
+
+    Tag[] value();
 
-    String value();
 }
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java b/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
index 7fcafee50..62de34c33 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
new file mode 100644
index 000000000..e68c09879
--- /dev/null
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
@@ -0,0 +1,61 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.config;
+
+import io.qameta.allure.util.PropertiesUtils;
+
+import java.util.Properties;
+
+import static java.lang.Boolean.parseBoolean;
+
+public class AllureTestNgConfig {
+
+    public static final String ALLURE_TESTNG_HIDE_DISABLED_TESTS = "allure.testng.hide.disabled.tests";
+    public static final String ALLURE_TESTNG_HIDE_CONFIGURATION_FAILURES = "allure.testng.hide.configuration.failures";
+    private boolean hideDisabledTests;
+    private boolean hideConfigurationFailures;
+
+    public AllureTestNgConfig(final Properties properties) {
+        this.hideDisabledTests = parseBoolean(properties.getProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS));
+        this.hideConfigurationFailures = parseBoolean(
+            properties.getProperty(ALLURE_TESTNG_HIDE_CONFIGURATION_FAILURES)
+        );
+    }
+
+    public boolean isHideDisabledTests() {
+        return hideDisabledTests;
+    }
+
+    public AllureTestNgConfig setHideDisabledTests(final boolean hide) {
+        this.hideDisabledTests = hide;
+        return this;
+    }
+
+    public boolean isHideConfigurationFailures() {
+        return hideConfigurationFailures;
+    }
+
+    public AllureTestNgConfig setHideConfigurationFailures(final boolean hideConfigurationFailure) {
+        this.hideConfigurationFailures = hideConfigurationFailure;
+        return this;
+    }
+
+    public static AllureTestNgConfig loadConfigProperties() {
+        final Properties properties = PropertiesUtils.loadAllureProperties();
+        return new AllureTestNgConfig(properties);
+    }
+
+}
diff --git a/allure-testng/src/main/resources/META-INF/aop-ajc.xml b/allure-testng/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-testng/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-testng/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,7 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
     </aspects>
-</aspectj>
\ No newline at end of file
+</aspectj>
diff --git a/allure-testng/src/main/services/org.testng.ITestNGListener b/allure-testng/src/main/services/org.testng.ITestNGListener
index 5be291131..cdf527c81 100644
--- a/allure-testng/src/main/services/org.testng.ITestNGListener
+++ b/allure-testng/src/main/services/org.testng.ITestNGListener
@@ -1 +1 @@
-io.qameta.allure.testng.AllureTestNg
\ No newline at end of file
+io.qameta.allure.testng.AllureTestNg
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index c8ff94225..1276a2120 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,14 +15,9 @@
  */
 package io.qameta.allure.testng;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.ExecutableItem;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
@@ -33,9 +28,15 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.model.WithSteps;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import io.qameta.allure.testng.config.AllureTestNgConfig;
+import io.qameta.allure.testng.samples.PriorityTests;
+import io.qameta.allure.testng.samples.TestsWithIdForFilter;
 import org.assertj.core.api.Condition;
 import org.assertj.core.groups.Tuple;
 import org.testng.ITestNGListener;
@@ -47,8 +48,10 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -66,11 +69,12 @@
 @SuppressWarnings("deprecation")
 public class AllureTestNgTest {
 
-    private static final Condition<List<? extends ExecutableItem>> ALL_FINISHED = new Condition<>(items ->
+
+    private static final Condition<List<? extends FixtureResult>> ALL_FINISHED = new Condition<>(items ->
             items.stream().allMatch(item -> item.getStage() == Stage.FINISHED),
             "All items should have be in a finished stage");
 
-    private static final Condition<List<? extends ExecutableItem>> WITH_STEPS = new Condition<>(items ->
+    private static final Condition<List<? extends WithSteps>> WITH_STEPS = new Condition<>(items ->
             items.stream().allMatch(item -> item.getSteps().size() == 1),
             "All items should have a step attached");
 
@@ -100,6 +104,35 @@ public static Object[][] parallelConfiguration() {
         };
     }
 
+    @AllureFeatures.Fixtures
+    @Issue("356")
+    @Test
+    public void shouldSetHideConfigFailProperty() {
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        assertThat(allureTestNgConfig.isHideConfigurationFailures()).isFalse();
+        allureTestNgConfig.setHideConfigurationFailures(true);
+        assertThat(allureTestNgConfig.isHideConfigurationFailures()).isTrue();
+    }
+
+    @AllureFeatures.Fixtures
+    @Issue("356")
+    @Test
+    public void shouldNotDisplayConfigurationFailsAsTests() {
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        allureTestNgConfig.setHideConfigurationFailures(true);
+        final AllureResults results = runTestNgSuites(allureTestNgConfig, "suites/gh-135.xml");
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsOnly(tuple("someTest", Status.SKIPPED));
+    }
+
+    @Test
+    public void shouldSetConfigurationProperty() {
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        allureTestNgConfig.setHideDisabledTests(true);
+        assertThat(allureTestNgConfig.isHideDisabledTests()).isEqualTo(true);
+    }
+
     @AllureFeatures.Parallel
     @Test(description = "Parallel data provider tests")
     public void parallelDataProvider() {
@@ -143,7 +176,7 @@ public void testWithTimeout(final XmlSuite.ParallelMode mode, final int threadCo
                 .hasSize(2)
                 .as("Unexpectedly passed status or stage of tests")
                 .allMatch(testResult -> testResult.getStatus().equals(Status.PASSED) &&
-                        testResult.getStage().equals(Stage.FINISHED))
+                                        testResult.getStage().equals(Stage.FINISHED))
                 .extracting(TestResult::getName)
                 .as("Unexpectedly passed name of tests")
                 .containsOnlyElementsOf(asList(
@@ -169,7 +202,7 @@ public void descriptionsWithLineSeparationTest() {
             System.setProperty(ALLURE_SEPARATE_LINES_SYSPROP, "true");
         }
         try {
-            final String testDescription = "Sample test description<br /> - next line<br /> - another line<br />";
+            final String testDescription = "Sample test description<br /> - next line<br /> - another line";
             final AllureResults results = runTestNgSuites("suites/descriptions-test.xml");
             List<TestResult> testResult = results.getTestResults();
 
@@ -194,12 +227,12 @@ public void descriptionsTest() {
         assertThat(testResult).as("Test case result has not been written")
                 .hasSize(2)
                 .filteredOn(result -> result.getName().equals("test"))
-                .extracting(result -> result.getDescriptionHtml().trim())
+                .extracting(TestResult::getDescriptionHtml)
+                .map(String::trim)
                 .as("Javadoc description of test case has not been processed")
                 .contains(testDescription);
     }
 
-    @SuppressWarnings("unchecked")
     @AllureFeatures.Descriptions
     @Test(description = "Javadoc description of befores", dataProvider = "parallelConfiguration")
     public void descriptionsBefores(final XmlSuite.ParallelMode mode, final int threadCount) {
@@ -404,7 +437,7 @@ public void perTestTagFixtures(final XmlSuite.ParallelMode mode, final int threa
 
         final AllureResults results = runTestNgSuites(
                 parallel(mode, threadCount),
-                "suites/per-test-tag-fixtures-combination.xml"
+                "suites/per-test-fixtures-combination.xml"
         );
 
         List<TestResult> testResult = results.getTestResults();
@@ -431,11 +464,21 @@ public void skippedSuiteTest() {
         List<TestResultContainer> testContainers = results.getTestResultContainers();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
-                .contains(
+                .containsExactlyInAnyOrder(
                         tuple("skippedTest", Status.SKIPPED),
+                        tuple("skipSuite", Status.BROKEN),
                         tuple("testWithOneStep", Status.SKIPPED)
                 );
-        assertThat(testContainers).as("Unexpected quantity of testng containers has been written").hasSize(4);
+        assertThat(testContainers)
+                .as("Unexpected quantity of testng containers has been written")
+                .extracting(TestResultContainer::getName)
+                .containsExactlyInAnyOrder(
+                        "Test tag 8",
+                        "Test suite 8",
+                        "io.qameta.allure.testng.samples.SkippedSuite",
+                        "io.qameta.allure.testng.samples.TestsWithSteps",
+                        "io.qameta.allure.testng.samples.SkippedSuite.skippedBeforeMethod"
+                );
 
         assertThat(findTestContainerByName(results, "Test suite 8").getBefores())
                 .as("Before suite container should have a before method with one step")
@@ -669,11 +712,46 @@ public void ownerTest() {
         final AllureResults results = runTestNgSuites("suites/owner.xml");
         List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .hasSize(8)
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> "owner".equals(label.getName()))
-                .extracting(Label::getValue)
-                .containsExactly("charlie", "charlie", "other-guy", "eroshenkoam", "eroshenkoam", "other-guy");
+                .extracting(TestResult::getFullName, tr -> tr.getLabels()
+                        .stream()
+                        .filter(label -> "owner".equals(label.getName()))
+                        .map(Label::getValue)
+                        .sorted()
+                        .collect(Collectors.joining(",", "[", "]"))
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithoutOwner", "[]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithoutOwner", "[]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithOwner", "[eroshenkoam,other-guy]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithOwner", "[eroshenkoam,other-guy]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithoutOwner", "[eroshenkoam]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithoutOwner", "[eroshenkoam]")
+                );
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test(description = "Should add tag to tests")
+    public void tagTest() {
+        final AllureResults results = runTestNgSuites("suites/tags.xml");
+        List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getFullName, tr -> tr.getLabels()
+                        .stream()
+                        .filter(label -> "tag".equals(label.getName()))
+                        .map(Label::getValue)
+                        .sorted()
+                        .collect(Collectors.joining(",", "[", "]"))
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.testng.samples.TagMethodTest.testWithTag", "[regress]"),
+                        tuple("io.qameta.allure.testng.samples.TagMethodTest.testWithTags", "[regress,smoke]"),
+                        tuple("io.qameta.allure.testng.samples.TagMethodTest.testWithoutTag", "[]"),
+                        tuple("io.qameta.allure.testng.samples.TagClassTest.testWithoutTag", "[class-tag]"),
+                        tuple("io.qameta.allure.testng.samples.TagClassTest.testWithTag", "[class-tag,method-tag-single]"),
+                        tuple("io.qameta.allure.testng.samples.TagClassTest.testWithTags", "[class-tag,method-tag-1,method-tag-2]")
+                );
     }
 
     @AllureFeatures.Attachments
@@ -725,7 +803,8 @@ public void shouldGenerateSameHistoryIdForTheSameTests() {
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("45e3e2818aabf660b03908be12ba64f7", "45e3e2818aabf660b03908be12ba64f7");
+                .hasSize(2)
+                .containsOnly("45e3e2818aabf660b03908be12ba64f7");
     }
 
     @SuppressWarnings("unchecked")
@@ -737,7 +816,7 @@ public void shouldSetCorrectStatusesForFixtures() {
                 "suites/per-suite-fixtures-combination.xml",
                 "suites/per-method-fixtures-combination.xml",
                 "suites/per-class-fixtures-combination.xml",
-                "suites/per-test-tag-fixtures-combination.xml",
+                "suites/per-test-fixtures-combination.xml",
                 "suites/failed-test-passed-fixture.xml"
         );
 
@@ -975,6 +1054,7 @@ public void shouldAddCorrectBeforeMethodFixturesInCaseOfParallelRun(
         });
     }
 
+    @SuppressWarnings("unchecked")
     @AllureFeatures.Fixtures
     @Issue("135")
     @Test
@@ -990,9 +1070,17 @@ public void shouldProcessConfigurationFailure() {
 
         assertThat(results.getTestResults())
                 .filteredOn("name", "failed configuration")
-                .extracting(ExecutableItem::getStatusDetails)
+                .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
                 .containsExactly("fail");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "failed configuration")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("AS_ID", "-1")
+                );
     }
 
     @AllureFeatures.IgnoredTests
@@ -1003,12 +1091,25 @@ public void shouldDisplayDisabledTests() {
 
         assertThat(results.getTestResults())
                 .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactly(
-                        tuple("disabled", null)
+                .containsExactlyInAnyOrder(
+                        tuple("disabled", null),
+                        tuple("enabled", Status.PASSED)
                 );
 
     }
 
+    @AllureFeatures.IgnoredTests
+    @Issue("369")
+    @Test
+    public void shouldNotDisplayDisabledTests() {
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        allureTestNgConfig.setHideDisabledTests(true);
+        final AllureResults results = runTestNgSuites(allureTestNgConfig, "suites/gh-369.xml");
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsOnly(tuple("enabled", Status.PASSED));
+    }
+
     @SuppressWarnings("unchecked")
     @AllureFeatures.Parameters
     @Issue("129")
@@ -1082,12 +1183,6 @@ public void shouldOverrideParameters() {
                 );
     }
 
-    private AllureResults runTestNgSuites(final String... suites) {
-        final Consumer<TestNG> emptyConfigurer = testNg -> {
-        };
-        return runTestNgSuites(emptyConfigurer, suites);
-    }
-
     @SuppressWarnings("unchecked")
     @AllureFeatures.Parameters
     @Issue("141")
@@ -1105,8 +1200,65 @@ public void shouldSupportFactoryOnConstructor() {
                 );
     }
 
+    @DataProvider(name = "failedFixtures")
+    public Object[][] failedFixtures() {
+        return new Object[][]{
+                {"suites/failed-before-test-fixture.xml", "beforeTest"},
+                {"suites/failed-before-class-fixture.xml", "beforeClass"},
+                {"suites/failed-before-suite-fixture.xml", "beforeSuite"}
+        };
+    }
+
+    @Test(dataProvider = "failedFixtures")
+    @AllureFeatures.Fixtures
+    public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final String fixture) {
+        final AllureResults results = runTestNgSuites(suite);
+        final Optional<TestResult> result = results.getTestResults().stream()
+                .filter(r -> r.getName().contains(fixture))
+                .findAny();
+        assertThat(result).as("Before failed fake test result").isNotEmpty();
+        final Optional<TestResultContainer> befores = results.getTestResultContainers().stream()
+                .filter(c -> Objects.nonNull(c.getBefores()) && c.getBefores().size() > 0)
+                .findAny();
+        assertThat(result).as("Before failed configuration container").isNotEmpty();
+        assertThat(befores.get().getChildren())
+                .contains(result.get().getUuid());
+    }
+
+    @Test
+    @AllureFeatures.Ordering
+    public void shouldOrderTests() {
+        final AllureResults results = runTestPlan(null, PriorityTests.class);
+        final List<String> ordered = results.getTestResults().stream()
+                .sorted(Comparator.comparing(this::getOrderParameter))
+                .map(TestResult::getName)
+                .collect(Collectors.toList());
+        System.out.println(Arrays.toString(ordered.toArray()));
+        assertThat(ordered)
+                .containsExactly("zTest", "yTest", "xTest", "wTest", "vTest", "vTest");
+    }
+
+    private AllureResults runTestNgSuites(final String... suites) {
+        final Consumer<TestNG> emptyConfigurer = testNg -> {
+        };
+        return runTestNgSuites(emptyConfigurer, suites);
+    }
+
+    private AllureResults runTestNgSuites(AllureTestNgConfig config, final String... suites) {
+        final Consumer<TestNG> emptyConfigurer = testNg -> {
+        };
+        return runTestNgSuites(emptyConfigurer, config, suites);
+    }
+
+    private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
+                                          final String... suites) {
+        ;
+        return runTestNgSuites(configurer, AllureTestNgConfig.loadConfigProperties(), suites);
+    }
+
     @Step("Run testng suites {suites}")
     private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
+                                          final AllureTestNgConfig config,
                                           final String... suites) {
         final ClassLoader classLoader = getClass().getClassLoader();
         List<String> suiteFiles = Arrays.stream(suites)
@@ -1119,27 +1271,17 @@ private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
                 .as("Cannot find all suite xml files")
                 .hasSameSizeAs(suiteFiles);
 
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(results);
-        final AllureTestNg adapter = new AllureTestNg(lifecycle);
-        final TestNG testNg = new TestNG(false);
-        testNg.addListener((ITestNGListener) adapter);
-        testNg.setTestSuites(suiteFiles);
-
-        configurer.accept(testNg);
+        return RunUtils.runTests(lifecycle -> {
+            final AllureTestNg adapter = new AllureTestNg(lifecycle,
+                    new AllureTestNgTestFilter(),
+                    config);
+            final TestNG testNg = new TestNG(false);
+            testNg.addListener((ITestNGListener) adapter);
+            testNg.setTestSuites(suiteFiles);
 
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+            configurer.accept(testNg);
             testNg.run();
-        } finally {
-            Allure.setLifecycle(cached);
-            StepsAspects.setLifecycle(cached);
-            AttachmentsAspects.setLifecycle(cached);
-        }
-        return results;
+        });
     }
 
     protected Consumer<TestNG> parallel(final XmlSuite.ParallelMode mode,
@@ -1174,13 +1316,13 @@ private Predicate<TestResult> hasLinks() {
     @Step("Find flaky")
     private Predicate<TestResult> flakyPredicate() {
         return testResult -> Objects.nonNull(testResult.getStatusDetails())
-                && testResult.getStatusDetails().isFlaky();
+                             && testResult.getStatusDetails().isFlaky();
     }
 
     @Step("Find muted")
     private Predicate<TestResult> mutedPredicate() {
         return testResult -> Objects.nonNull(testResult.getStatusDetails())
-                && testResult.getStatusDetails().isMuted();
+                             && testResult.getStatusDetails().isMuted();
     }
 
     @Step("Get uuids by container name")
@@ -1262,4 +1404,124 @@ private static void checkTestJavadocDescriptions(List<TestResult> results, Strin
                 .containsOnly(expectedDescriptionHtml);
     }
 
+    private final TestPlanV1_0.TestCase onlyId2 = new TestPlanV1_0.TestCase().setId("2");
+    private final TestPlanV1_0.TestCase onlyId4 = new TestPlanV1_0.TestCase().setId("4");
+
+    private final TestPlanV1_0.TestCase test1 = new TestPlanV1_0.TestCase().setId("1")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test1");
+    private final TestPlanV1_0.TestCase test2 = new TestPlanV1_0.TestCase()
+            .setId("2")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test2");
+    private final TestPlanV1_0.TestCase test3 = new TestPlanV1_0.TestCase()
+            .setId("3")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test3");
+    private final TestPlanV1_0.TestCase otherId = new TestPlanV1_0.TestCase().setId("4")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test1");
+    private final TestPlanV1_0.TestCase skipped = new TestPlanV1_0.TestCase().setId("5")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.skipped");
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelector = new TestPlanV1_0.TestCase()
+            .setId("3")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test3");
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelectorFailed = new TestPlanV1_0.TestCase()
+            .setId("6")
+            .setSelector("allure.junit4.samples.TestsWithIdForFilter.test3");
+
+
+    @Test
+    @AllureFeatures.Filtration
+    public void simpleFiltration() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, test2, test3));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test1", Status.PASSED),
+                        tuple("test2", Status.PASSED),
+                        tuple("test3", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void onlyId() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(onlyId2, onlyId4));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test4", Status.PASSED),
+                        tuple("test2", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void idAssignToOtherTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(otherId));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test1", Status.PASSED),
+                        tuple("test4", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void skippedTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(skipped));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("skipped", null)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void correctIdIncorrectSelector() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(
+                Arrays.asList(test1, test2, correctIdIncorrectSelector, correctIdIncorrectSelectorFailed)
+        );
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+        assertThat(testResults)
+                .hasSize(4)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test1", Status.PASSED),
+                        tuple("test2", Status.PASSED),
+                        tuple("test3", Status.PASSED),
+                        tuple("test6", Status.FAILED)
+                );
+    }
+
+    public AllureResults runTestPlan(final TestPlan plan, final Class<?>... testClasses) {
+        return RunUtils.runTests(lifecycle -> {
+            final AllureTestNg adapter = new AllureTestNg(lifecycle, new AllureTestNgTestFilter(plan));
+            final TestNG testNG = new TestNG(false);
+            testNG.addListener((ITestNGListener) adapter);
+            testNG.setTestClasses(testClasses);
+            testNG.setOutputDirectory("build/test-output");
+            testNG.run();
+        });
+    }
+
+    private Integer getOrderParameter(final TestResult result) {
+        return result.getParameters().stream()
+                .filter(p -> p.getName().equals("order"))
+                .map(Parameter::getValue)
+                .map(Integer::parseInt)
+                .findAny()
+                .orElse(0);
+    }
+
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
index 19e5b5df2..563680c60 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
index 7399eac70..f24a42c19 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
index 71f88dc7d..a816b75d7 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
index e90bca720..62485655a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
index e2fee0852..460d1b0c9 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
index 1d71e10e7..a99c791bb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
index e37b6c1c3..23e4b8949 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
index cdcdf49b9..9aa261359 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
index 24efb054b..0122ae8df 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
index b0b8c6b37..802a5a309 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
index c500d2873..258a738fd 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
index dd4984ba3..a58f47ace 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
index 7df51b414..76195b36f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
index fc3b8262b..a620ffbba 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
index da723cfd2..196aad966 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
index 5775f0ac3..d258efa0b 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
index a13f441be..475ffb5bd 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
index bd9fc9a9c..994e32565 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
index 3e8ab149f..cb5f9f3df 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
index 3772bce0d..c16eab81a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
index 1ecc3ae67..b01b16f4f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,4 +25,8 @@ public class DisabledTest {
     @Test(enabled = false)
     public void disabled() {
     }
+
+    @Test
+    public void enabled() {
+    }
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
index 8d9fdfc24..4f2af21c4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
index 649fea153..5297b3d69 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
index c794347a3..09ed05877 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
index 9fd4a952c..417b2fbfc 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
new file mode 100644
index 000000000..05d8853fb
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static io.qameta.allure.Allure.step;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class FailedBeforeClass {
+
+    @BeforeClass
+    public void beforeClass() throws Exception {
+        step("before class step");
+        throw new RuntimeException();
+    }
+
+    @Test
+    public void skipped() throws Exception {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
index b0b1eaa34..fdba2be7f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static io.qameta.allure.Allure.step;
+
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -25,6 +27,7 @@ public class FailedBeforeMethod {
 
     @BeforeMethod
     public void beforeMethod() throws Exception {
+        step("before method step");
         throw new RuntimeException();
     }
 
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
index c025d019d..4226d81f8 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
+import static io.qameta.allure.Allure.step;
+
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -25,6 +27,7 @@ public class FailedBeforeSuite {
 
     @BeforeSuite
     public void beforeSuite() throws Exception {
+        step("before suite step");
         throw new RuntimeException();
     }
 
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
index e4964f946..bd498a19a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import static io.qameta.allure.Allure.step;
+
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -25,6 +27,7 @@ public class FailedBeforeTest {
 
     @BeforeTest
     public void beforeTest() throws Exception {
+        step("before test step");
         throw new RuntimeException();
     }
 
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
index a11acb9ab..7bf87987e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
index 4d3524532..578b4f807 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
index 1dedbe5ee..d5a24421c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
index 37ef45fbc..94e0922d9 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
index 293d00a23..5441c5940 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
index b1d50c574..970dd55af 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
index 20cd5155c..317c0603b 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
index 80ea6f84a..65b002350 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
index c2297a372..e21a0ac06 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
index cb383f502..98f2f142d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
index f98541dfb..b964fbb46 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
index 351a5b5dd..c63d7b821 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
index 2f960863f..fd0f30bfa 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
index f079e1a71..078f3b0a4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
index eb149798c..0edc9b78f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
index cb9c3a304..741cb2924 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
index 25f6f0df1..f12af9f78 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
index 211522528..bb1482c06 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
index f0d534ed3..36cbed218 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
index 64780d44d..26a18b612 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
index a6fb4e849..8c5b56bc7 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
index 198586ca0..1b6e7251e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
index 28d4cd5ca..5a98b901b 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
index de1adde10..3adfa59eb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
index 567b6dae7..385689b14 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
index 701663c7f..49c67d25c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
index c8a859938..ec0515dbf 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
index f3d5adced..51c1a6c1a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
new file mode 100644
index 000000000..da09bb7fd
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
@@ -0,0 +1,57 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import io.qameta.allure.Step;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Egor Borisov ehborisov@gmail.com
+ */
+public class PerTestFixtures {
+
+    @BeforeTest
+    public void beforeTest1() {
+        step();
+    }
+
+    @BeforeTest
+    public void beforeTest2() {
+        step();
+    }
+
+    @Test
+    public void test() {
+        step();
+    }
+
+    @AfterTest
+    public void afterTest1() {
+        step();
+    }
+
+    @AfterTest
+    public void afterTest2() {
+        step();
+    }
+
+    @Step
+    public void step() {
+
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
new file mode 100644
index 000000000..b61c15088
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
@@ -0,0 +1,64 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static io.qameta.allure.Allure.parameter;
+
+public class PriorityTests {
+
+    private final static String ORDER_PARAMETER = "order";
+
+    private final AtomicInteger cnt = new AtomicInteger();
+
+    @DataProvider(name = "someProvider")
+    public static Object[][] someProvider() {
+        return new Object[][]{
+                new Object[]{1},
+                new Object[]{2}
+        };
+    }
+
+    @Test(dataProvider = "someProvider", priority = 4)
+    public void vTest(int parameter) {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test(priority = 3)
+    public void wTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test(priority = 2)
+    public void xTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test(priority = 1)
+    public void yTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test
+    public void zTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
index f24a30ca5..94f28efc4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
index fd8e25385..3f8468389 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
index 2f59dc291..968fbe9ff 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
index b7e262097..fe2671834 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
index 2cb9f4349..87d1ddffd 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
index 8dbb03e05..45d36923c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
index 69d676785..d1ab7946d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
new file mode 100644
index 000000000..f9fa0f65a
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import io.qameta.allure.testng.Tag;
+import io.qameta.allure.testng.Tags;
+import org.testng.annotations.Test;
+
+/**
+ * @author neparij (Nikolay Laptev).
+ */
+@Tag("class-tag")
+public class TagClassTest {
+
+    @Test
+    @Tag("method-tag-single")
+    public void testWithTag() throws Exception {
+    }
+
+    @Test
+    @Tags({@Tag("method-tag-1"), @Tag("method-tag-2")})
+    public void testWithTags() throws Exception {
+    }
+
+    @Test
+    public void testWithoutTag() throws Exception {
+    }
+}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
similarity index 54%
rename from allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
rename to allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
index e0bdbe22f..0aae5a0aa 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,27 +13,28 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package ru.yandex.qatools.allure.model;
+package io.qameta.allure.testng.samples;
+
+import io.qameta.allure.testng.Tag;
+import io.qameta.allure.testng.Tags;
+import org.testng.annotations.Test;
 
 /**
- * Description type.
+ * @author neparij (Nikolay Laptev).
  */
-public enum DescriptionType {
-
-    MARKDOWN("markdown"),
-
-    TEXT("text"),
+public class TagMethodTest {
 
-    HTML("html");
-
-    private final String value;
-
-    DescriptionType(final String value) {
-        this.value = value;
+    @Test
+    @Tag("regress")
+    public void testWithTag() throws Exception {
     }
 
-    public String value() {
-        return value;
+    @Test
+    @Tags({@Tag("regress"), @Tag("smoke")})
+    public void testWithTags() throws Exception {
     }
 
+    @Test
+    public void testWithoutTag() throws Exception {
+    }
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
index c9242d7e2..af3aeb2f4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
index f23e504e4..bd08a9ba2 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
index 02447df3c..548d2780c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
new file mode 100644
index 000000000..aa401db70
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import io.qameta.allure.AllureId;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.testng.annotations.Test;
+
+public class TestsWithIdForFilter {
+
+    @Test
+    @AllureId("1")
+    public void test1() {
+    }
+
+    @Test
+    @AllureId("2")
+    public void test2() {
+    }
+
+    @Test
+    public void test3() {
+    }
+
+    @Test
+    @AllureId("4")
+    public void test4() {
+    }
+
+    @Test(enabled = false)
+    @AllureId("5")
+    public void skipped() {
+    }
+
+    @Test
+    @AllureId("6")
+    public void test6() {
+        assertThat(true).isFalse();
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
index 157a9981e..25faca37c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
index b2f363422..f620badc1 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/resources/suites/all-features.xml b/allure-testng/src/test/resources/suites/all-features.xml
index ae78bc46a..5a2654f96 100644
--- a/allure-testng/src/test/resources/suites/all-features.xml
+++ b/allure-testng/src/test/resources/suites/all-features.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/attachments.xml b/allure-testng/src/test/resources/suites/attachments.xml
index 42e80252a..2de7fd740 100644
--- a/allure-testng/src/test/resources/suites/attachments.xml
+++ b/allure-testng/src/test/resources/suites/attachments.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/bdd-annotations.xml b/allure-testng/src/test/resources/suites/bdd-annotations.xml
index 263f50759..35bc9b57e 100644
--- a/allure-testng/src/test/resources/suites/bdd-annotations.xml
+++ b/allure-testng/src/test/resources/suites/bdd-annotations.xml
@@ -8,4 +8,4 @@
             <class name="io.qameta.allure.testng.samples.BddAnnotationsTestsInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/broken.xml b/allure-testng/src/test/resources/suites/broken.xml
index 2c06be806..8c5280f29 100644
--- a/allure-testng/src/test/resources/suites/broken.xml
+++ b/allure-testng/src/test/resources/suites/broken.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml b/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml
index e6b58bc2b..cdf35c371 100644
--- a/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml
+++ b/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml b/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml
index a4ff104f6..08aa85e7f 100644
--- a/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml
+++ b/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml
@@ -11,4 +11,4 @@
     <listeners>
         <listener class-name="io.qameta.allure.testng.AllureTestNg"/>
     </listeners>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/descriptions-test.xml b/allure-testng/src/test/resources/suites/descriptions-test.xml
index d146cbd7d..7bc8ce60e 100644
--- a/allure-testng/src/test/resources/suites/descriptions-test.xml
+++ b/allure-testng/src/test/resources/suites/descriptions-test.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.DescriptionsTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml b/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml
index 7999d78e6..766cb4b6c 100644
--- a/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedAfterMethod"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml b/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml
index c78c1e25d..729a64f21 100644
--- a/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedAfterSuite"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml b/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml
index 1ddf24d0c..794f22806 100644
--- a/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedAfterTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-before-class-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-class-fixture.xml
new file mode 100644
index 000000000..74377bcad
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/failed-before-class-fixture.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="Fixtures Support">
+    <test name="Test fixtures">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.FailedBeforeClass"/>
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml
index 0249fd3b8..8536b19c5 100644
--- a/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedBeforeMethod"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml
index 8049565e7..8cf017945 100644
--- a/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedBeforeSuite"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml
index 12bb60761..7fa23084c 100644
--- a/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedBeforeTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml b/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml
index 076988b92..944827b31 100644
--- a/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedTestPassedBeforeFixture"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failing-by-assertion.xml b/allure-testng/src/test/resources/suites/failing-by-assertion.xml
index ae8503fc7..fa1f373b6 100644
--- a/allure-testng/src/test/resources/suites/failing-by-assertion.xml
+++ b/allure-testng/src/test/resources/suites/failing-by-assertion.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/flaky.xml b/allure-testng/src/test/resources/suites/flaky.xml
index 456e30cff..97bbc749c 100644
--- a/allure-testng/src/test/resources/suites/flaky.xml
+++ b/allure-testng/src/test/resources/suites/flaky.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.FlakyTestClassInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-101.xml b/allure-testng/src/test/resources/suites/gh-101.xml
index 1457eb828..5afef5fc9 100644
--- a/allure-testng/src/test/resources/suites/gh-101.xml
+++ b/allure-testng/src/test/resources/suites/gh-101.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FixtureWithDescription"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-102.xml b/allure-testng/src/test/resources/suites/gh-102.xml
index be31b547b..bdac2559f 100644
--- a/allure-testng/src/test/resources/suites/gh-102.xml
+++ b/allure-testng/src/test/resources/suites/gh-102.xml
@@ -8,4 +8,4 @@
             <class name="io.qameta.allure.testng.samples.BaseTestB"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-106.xml b/allure-testng/src/test/resources/suites/gh-106.xml
index 04deb1902..4dec26138 100644
--- a/allure-testng/src/test/resources/suites/gh-106.xml
+++ b/allure-testng/src/test/resources/suites/gh-106.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.CyrillicDescriptions"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-128.xml b/allure-testng/src/test/resources/suites/gh-128.xml
index a55b8b93b..cf29f3df1 100644
--- a/allure-testng/src/test/resources/suites/gh-128.xml
+++ b/allure-testng/src/test/resources/suites/gh-128.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.DataProviderWithArray"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-129.xml b/allure-testng/src/test/resources/suites/gh-129.xml
index 587d8c661..955ecc9f6 100644
--- a/allure-testng/src/test/resources/suites/gh-129.xml
+++ b/allure-testng/src/test/resources/suites/gh-129.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.NullParamTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-135.xml b/allure-testng/src/test/resources/suites/gh-135.xml
index ec5c902b0..012b1299d 100644
--- a/allure-testng/src/test/resources/suites/gh-135.xml
+++ b/allure-testng/src/test/resources/suites/gh-135.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.ConfigurationFailure"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-141.xml b/allure-testng/src/test/resources/suites/gh-141.xml
index 3ba451d89..ba38d9d17 100644
--- a/allure-testng/src/test/resources/suites/gh-141.xml
+++ b/allure-testng/src/test/resources/suites/gh-141.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FactoryOnConstructorTests"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-219.xml b/allure-testng/src/test/resources/suites/gh-219.xml
index bceadc7a0..ce8355492 100644
--- a/allure-testng/src/test/resources/suites/gh-219.xml
+++ b/allure-testng/src/test/resources/suites/gh-219.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.BeforeMethods"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-304.xml b/allure-testng/src/test/resources/suites/gh-304.xml
index 7c2c9c6ab..303a2eb1a 100644
--- a/allure-testng/src/test/resources/suites/gh-304.xml
+++ b/allure-testng/src/test/resources/suites/gh-304.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedSetUp"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-369.xml b/allure-testng/src/test/resources/suites/gh-369.xml
new file mode 100644
index 000000000..739a9f87f
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/gh-369.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="Github Issues">
+    <test name="gh-369">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.DisabledTest"/>
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-42.xml b/allure-testng/src/test/resources/suites/gh-42.xml
index ab6ce4368..450439705 100644
--- a/allure-testng/src/test/resources/suites/gh-42.xml
+++ b/allure-testng/src/test/resources/suites/gh-42.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedFlakyTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-49.xml b/allure-testng/src/test/resources/suites/gh-49.xml
index c70fb6ebc..8c18dc46d 100644
--- a/allure-testng/src/test/resources/suites/gh-49.xml
+++ b/allure-testng/src/test/resources/suites/gh-49.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.DisabledTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-97.xml b/allure-testng/src/test/resources/suites/gh-97.xml
index 3b2865ac8..2799b57e1 100644
--- a/allure-testng/src/test/resources/suites/gh-97.xml
+++ b/allure-testng/src/test/resources/suites/gh-97.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.VarargsParameters"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-99.xml b/allure-testng/src/test/resources/suites/gh-99.xml
index 0a38a78ac..dd18d31ec 100644
--- a/allure-testng/src/test/resources/suites/gh-99.xml
+++ b/allure-testng/src/test/resources/suites/gh-99.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.ClassFixturesInParent"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/history-id-parameters.xml b/allure-testng/src/test/resources/suites/history-id-parameters.xml
index f77fbef2c..206161756 100644
--- a/allure-testng/src/test/resources/suites/history-id-parameters.xml
+++ b/allure-testng/src/test/resources/suites/history-id-parameters.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.HistoryIdForTestWithDataProvider"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/history-id-the-same.xml b/allure-testng/src/test/resources/suites/history-id-the-same.xml
index 08fd9379d..21d93de9e 100644
--- a/allure-testng/src/test/resources/suites/history-id-the-same.xml
+++ b/allure-testng/src/test/resources/suites/history-id-the-same.xml
@@ -12,4 +12,4 @@
             <class name="io.qameta.allure.testng.samples.JustTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/links.xml b/allure-testng/src/test/resources/suites/links.xml
index 415a5fe1c..3a4070084 100644
--- a/allure-testng/src/test/resources/suites/links.xml
+++ b/allure-testng/src/test/resources/suites/links.xml
@@ -8,4 +8,4 @@
             <class name="io.qameta.allure.testng.samples.LinksOnTestsInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/muted.xml b/allure-testng/src/test/resources/suites/muted.xml
index 13da15e76..4ded62ae1 100644
--- a/allure-testng/src/test/resources/suites/muted.xml
+++ b/allure-testng/src/test/resources/suites/muted.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.MutedTestClassInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/nested-steps.xml b/allure-testng/src/test/resources/suites/nested-steps.xml
index be9f3652b..56c2368ae 100644
--- a/allure-testng/src/test/resources/suites/nested-steps.xml
+++ b/allure-testng/src/test/resources/suites/nested-steps.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/owner.xml b/allure-testng/src/test/resources/suites/owner.xml
index d4f54561a..831ab32f9 100644
--- a/allure-testng/src/test/resources/suites/owner.xml
+++ b/allure-testng/src/test/resources/suites/owner.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.OwnerClassTestInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parallel-data-provider.xml b/allure-testng/src/test/resources/suites/parallel-data-provider.xml
index 41e1b831f..b9f37a2ab 100644
--- a/allure-testng/src/test/resources/suites/parallel-data-provider.xml
+++ b/allure-testng/src/test/resources/suites/parallel-data-provider.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parallel-methods.xml b/allure-testng/src/test/resources/suites/parallel-methods.xml
index 71fce6997..80d3089e7 100644
--- a/allure-testng/src/test/resources/suites/parallel-methods.xml
+++ b/allure-testng/src/test/resources/suites/parallel-methods.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parameterized-suite1.xml b/allure-testng/src/test/resources/suites/parameterized-suite1.xml
index 3e78702e4..1867af366 100644
--- a/allure-testng/src/test/resources/suites/parameterized-suite1.xml
+++ b/allure-testng/src/test/resources/suites/parameterized-suite1.xml
@@ -9,4 +9,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parameterized-suite2.xml b/allure-testng/src/test/resources/suites/parameterized-suite2.xml
index 279cc294d..2faa5f97a 100644
--- a/allure-testng/src/test/resources/suites/parameterized-suite2.xml
+++ b/allure-testng/src/test/resources/suites/parameterized-suite2.xml
@@ -9,4 +9,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parameterized-test.xml b/allure-testng/src/test/resources/suites/parameterized-test.xml
index f8f5340b4..6911eb613 100644
--- a/allure-testng/src/test/resources/suites/parameterized-test.xml
+++ b/allure-testng/src/test/resources/suites/parameterized-test.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml
index 467ad6a3c..a54c2e2f4 100644
--- a/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml
index c7e2bf9d8..d5834447c 100644
--- a/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml
index 1cfc65c42..5b569b57d 100644
--- a/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-test-fixtures-combination.xml
similarity index 76%
rename from allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml
rename to allure-testng/src/test/resources/suites/per-test-fixtures-combination.xml
index c625fc43f..469f4847e 100644
--- a/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-test-fixtures-combination.xml
@@ -4,8 +4,8 @@
 <suite name="Test suite 13">
     <test name="Test tag 13">
         <classes>
-            <class name="io.qameta.allure.testng.samples.TestTagFixtures">
+            <class name="io.qameta.allure.testng.samples.PerTestFixtures">
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/retry.xml b/allure-testng/src/test/resources/suites/retry.xml
index a1447f43b..f19500052 100644
--- a/allure-testng/src/test/resources/suites/retry.xml
+++ b/allure-testng/src/test/resources/suites/retry.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.RetryTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/severity.xml b/allure-testng/src/test/resources/suites/severity.xml
index 05f724124..7b53dbc71 100644
--- a/allure-testng/src/test/resources/suites/severity.xml
+++ b/allure-testng/src/test/resources/suites/severity.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.SeverityClassTestInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/single-test.xml b/allure-testng/src/test/resources/suites/single-test.xml
index efaa27d3d..36c3a07ee 100644
--- a/allure-testng/src/test/resources/suites/single-test.xml
+++ b/allure-testng/src/test/resources/suites/single-test.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/skipped-suite.xml b/allure-testng/src/test/resources/suites/skipped-suite.xml
index 24941b5d5..a77424175 100644
--- a/allure-testng/src/test/resources/suites/skipped-suite.xml
+++ b/allure-testng/src/test/resources/suites/skipped-suite.xml
@@ -13,4 +13,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/tags.xml b/allure-testng/src/test/resources/suites/tags.xml
new file mode 100644
index 000000000..f82f4844f
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/tags.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="Tags suite">
+    <test name="Tags tests">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.TagMethodTest"/>
+            <class name="io.qameta.allure.testng.samples.TagClassTest"/>
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/tests-with-timeout.xml b/allure-testng/src/test/resources/suites/tests-with-timeout.xml
index 2d8cac5a0..a2eb9f525 100644
--- a/allure-testng/src/test/resources/suites/tests-with-timeout.xml
+++ b/allure-testng/src/test/resources/suites/tests-with-timeout.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.TestWithTimeout"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/testng.xml b/allure-testng/src/test/resources/testng.xml
index aa0e45d43..ae0d72d39 100644
--- a/allure-testng/src/test/resources/testng.xml
+++ b/allure-testng/src/test/resources/testng.xml
@@ -14,4 +14,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/build.gradle.kts b/build.gradle.kts
index 62cf4780c..b1b3f9caf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,245 +1,391 @@
-import com.diffplug.gradle.spotless.SpotlessExtension
-import io.qameta.allure.gradle.AllureExtension
-import io.qameta.allure.gradle.task.AllureReport
-import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
-import org.gradle.jvm.tasks.Jar
-import ru.vyarus.gradle.plugin.quality.QualityExtension
-
-buildscript {
-    repositories {
-        maven("https://plugins.gradle.org/m2/")
-        mavenLocal()
-        jcenter()
-    }
-
-    dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:3.27.0")
-        classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
-        classpath("io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE")
-        classpath("ru.vyarus:gradle-quality-plugin:4.0.0")
-    }
-}
-
-val linkHomepage by extra("https://qameta.io/allure")
-val linkCi by extra("https://ci.qameta.in/job/allure-java_deploy/")
-val linkScmUrl by extra("https://github.com/allure-framework/allure-java")
-val linkScmConnection by extra("scm:git:git://github.com/allure-framework/allure-java.git")
-val linkScmDevConnection by extra("scm:git:ssh://git@github.com:allure-framework/allure-java.git")
+import com.github.spotbugs.snom.SpotBugsTask
 
 val gradleScriptDir by extra("${rootProject.projectDir}/gradle")
 val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
 
+val libs = subprojects.filterNot { it.name in "allure-bom" }
+
 tasks.withType(Wrapper::class) {
-    gradleVersion = "6.3"
+    gradleVersion = "8.5"
 }
 
 plugins {
     java
     `java-library`
-    id("net.researchgate.release") version "2.7.0"
-    id("io.qameta.allure") version "2.7.0"
+    `maven-publish`
+    signing
+    checkstyle
+    pmd
+    id("com.github.spotbugs")
+    id("com.diffplug.spotless")
+    id("io.github.gradle-nexus.publish-plugin")
+    id("io.qameta.allure-adapter") apply false
+    id("io.qameta.allure-report")
+    id("io.spring.dependency-management")
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
+
 tasks.withType(JavaCompile::class) {
     options.encoding = "UTF-8"
 }
 
-release {
-    tagTemplate = "\${version}"
-}
-
-val afterReleaseBuild by tasks.existing
-
 configure(listOf(rootProject)) {
     description = "Allure Java"
     group = "io.qameta.allure"
 }
 
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+        }
+    }
+}
+
 configure(subprojects) {
-    val project = this
     group = "io.qameta.allure"
     version = version
 
+    apply(plugin = "signing")
+    apply(plugin = "maven-publish")
+
+    publishing {
+        publications {
+            withType<MavenPublication>().configureEach {
+                pom {
+                    name.set(project.name)
+                    description.set("Module ${project.name} of Allure Framework.")
+                    url.set("https://allurereport.org/")
+                    organization {
+                        name.set("Qameta Software")
+                        url.set("https://qameta.io/")
+                    }
+                    licenses {
+                        license {
+                            name.set("The Apache License, Version 2.0")
+                            url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                        }
+                    }
+                    developers {
+                        developer {
+                            id.set("baev")
+                            name.set("Dmitry Baev")
+                            email.set("dmitry.baev@qameta.io")
+                            url.set("https://github.com/baev")
+                        }
+                        developer {
+                            id.set("eroshenkoam")
+                            name.set("Artem Eroshenko")
+                            email.set("artem.eroshenko@qameta.io")
+                            url.set("https://github.com/eroshenkoam")
+                        }
+                    }
+                    scm {
+                        developerConnection.set("scm:git:git://github.com/allure-framework/allure-java")
+                        connection.set("scm:git:git://github.com/allure-framework/allure-java")
+                        url.set("https://github.com/allure-framework/allure-java")
+                    }
+                    issueManagement {
+                        system.set("Github Issues")
+                        url.set("https://github.com/allure-framework/allure-java/issues")
+                    }
+                    ciManagement {
+                        system.set("Github Actions")
+                        url.set("https://github.com/allure-framework/allure-java/actions")
+                    }
+                }
+            }
+            create<MavenPublication>("maven") {
+                suppressAllPomMetadataWarnings()
+                versionMapping {
+                    allVariants {
+                        fromResolutionResult()
+                    }
+                }
+            }
+        }
+    }
+
+    signing {
+        sign(publishing.publications["maven"])
+    }
+
+    tasks.withType<Sign>().configureEach {
+        onlyIf { !project.version.toString().endsWith("-SNAPSHOT") }
+    }
+
+    tasks.withType<GenerateModuleMetadata> {
+        enabled = false
+    }
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+}
+
+configure(libs) {
+    val project = this
+    apply(plugin = "checkstyle")
+    apply(plugin = "pmd")
+    apply(plugin = "com.github.spotbugs")
+    apply(plugin = "com.diffplug.spotless")
+    apply(plugin = "io.qameta.allure-report")
+    apply(plugin = "io.qameta.allure-adapter")
+    apply(plugin = "io.spring.dependency-management")
     apply(plugin = "java")
     apply(plugin = "java-library")
-    apply(plugin = "maven")
-    apply(plugin = "io.spring.dependency-management")
-    apply(plugin = "ru.vyarus.quality")
-    apply(plugin = "com.diffplug.gradle.spotless")
-    apply(plugin = "io.qameta.allure")
-    apply(from = "$gradleScriptDir/bintray.gradle")
-    apply(from = "$gradleScriptDir/maven-publish.gradle")
 
-    configure<DependencyManagementExtension> {
+    val orgSlf4jVersion = "2.0.17"
+    val assertJVersion = "1.9.25"
+
+    dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.9.8")
-            mavenBom("org.junit:junit-bom:5.5.2")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.20.1")
+            mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {
-            dependency("com.github.tomakehurst:wiremock:2.21.0")
-            dependency("com.google.inject:guice:4.2.2")
-            dependency("com.google.testing.compile:compile-testing:0.15")
-            dependency("com.squareup.retrofit2:retrofit:2.5.0")
-            dependency("commons-io:commons-io:2.6")
-            dependency("io.github.benas:random-beans:3.8.0")
-            dependency("io.github.glytching:junit-extensions:2.3.0")
-            dependency("org.apache.commons:commons-lang3:3.8.1")
-            dependency("org.apache.httpcomponents:httpclient:4.5.7")
-            dependency("org.apache.tika:tika-core:1.20")
-            dependency("org.aspectj:aspectjrt:1.9.4")
-            dependency("org.aspectj:aspectjweaver:1.9.4")
-            dependency("org.assertj:assertj-core:3.11.1")
-            dependency("org.codehaus.groovy:groovy-all:2.5.6")
-            dependency("org.freemarker:freemarker:2.3.28")
-            dependency("org.jboss.resteasy:resteasy-client:3.6.2.Final")
-            dependency("org.jooq:joor-java-8:0.9.10")
-            dependency("org.mock-server:mockserver-netty:5.5.1")
-            dependency("org.mockito:mockito-core:2.24.0")
-            dependencySet("org.slf4j:1.7.30") {
-                entry("slf4j-api")
-                entry("slf4j-nop")
-                entry("slf4j-simple")
-            }
+            dependency("com.github.spotbugs:spotbugs:4.9.8")
+            dependency("com.github.tomakehurst:wiremock:3.0.1")
+            dependency("com.google.inject:guice:7.0.0")
+            dependency("com.google.testing.compile:compile-testing:0.23.0")
+            dependency("com.puppycrawl.tools:checkstyle:12.2.0")
+            dependency("com.squareup.retrofit2:retrofit:3.0.0")
+            dependency("commons-io:commons-io:2.20.0")
+            dependency("io.github.benas:random-beans:3.9.0")
+            dependency("io.github.glytching:junit-extensions:2.6.0")
+            dependency("javax.annotation:javax.annotation-api:1.3.2")
+            dependency("net.sourceforge.pmd:pmd-java:7.15.0")
+            dependency("org.apache.commons:commons-lang3:3.15.0")
+            dependency("org.aspectj:aspectjrt:${assertJVersion}")
+            dependency("org.aspectj:aspectjweaver:${assertJVersion}")
+            dependency("org.assertj:assertj-core:3.27.3")
+            dependency("org.freemarker:freemarker:2.3.33")
+            dependency("org.grpcmock:grpcmock-junit5:0.8.0")
+            dependency("org.hamcrest:hamcrest:3.0")
+            dependency("org.jboss.resteasy:resteasy-client:7.0.1.Final")
+            dependency("org.mock-server:mockserver-netty:5.15.0")
+            dependency("org.mockito:mockito-core:5.12.0")
+            dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
+            dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
+            dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")
+        }
+        generatedPomCustomization {
+            enabled(false)
         }
     }
 
-    tasks.compileJava {
-        options.encoding = "UTF-8"
+    // Excluding shadowed jars from pom.xml https://github.com/gradle/gradle/issues/10861#issuecomment-576562961
+    val internal by configurations.creating {
+        isVisible = false
+        isCanBeConsumed = false
+        isCanBeResolved = false
     }
+    configurations.compileClasspath.get().extendsFrom(internal)
+    configurations.runtimeClasspath.get().extendsFrom(internal)
+    configurations.testCompileClasspath.get().extendsFrom(internal)
+    configurations.testRuntimeClasspath.get().extendsFrom(internal)
 
-    tasks.compileTestJava {
-        options.encoding = "UTF-8"
-        options.compilerArgs.add("-parameters")
-    }
+    tasks {
+        compileJava {
+            options.compilerArgs.add("-Xlint:-options")
+            options.release.set(8)
+        }
+
+        compileTestJava {
+            options.compilerArgs.add("-parameters")
+        }
+
+        jar {
+            manifest {
+                attributes(
+                    mapOf(
+                        "Specification-Title" to project.name,
+                        "Implementation-Title" to project.name,
+                        "Implementation-Version" to project.version
+                    )
+                )
+            }
+        }
+
+        test {
+            systemProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug")
+            systemProperty("allure.model.indentOutput", "true")
+            systemProperty("junit.jupiter.execution.parallel.enabled", true)
+            systemProperty("junit.jupiter.execution.parallel.mode.default", "same_thread")
+            testLogging {
+                listOf(org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED)
+            }
+            maxHeapSize = project.property("test.maxHeapSize").toString()
+            maxParallelForks = Integer.parseInt(project.property("test.maxParallelForks") as String)
+            jvmArgs = listOf(
+                "--add-opens",
+                "java.base/java.lang=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.lang.invoke=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.util=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.text=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.lang.reflect=ALL-UNNAMED",
+                "--add-opens",
+                "java.desktop/java.awt.font=ALL-UNNAMED"
+            )
+        }
 
-    tasks.jar {
-        manifest {
-            attributes(mapOf(
-                    "Implementation-Title" to project.name,
-                    "Implementation-Version" to project.version
-            ))
+        processTestResources {
+            filesMatching("**/allure.properties") {
+                filter {
+                    it.replace("#project.description#", project.description ?: project.name)
+                }
+            }
         }
     }
 
-    tasks.test {
-        systemProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug")
-        systemProperty("allure.model.indentOutput", "true")
-        testLogging {
-            events("passed", "skipped", "failed")
+    allure {
+        adapter {
+            autoconfigure.set(false)
+            aspectjWeaver.set(true)
+            aspectjVersion.set(dependencyManagement.managedVersions["org.aspectj:aspectjweaver"])
+
+            // in order to disable dependencySubstitution (spi-off classifier)
+            autoconfigureListeners.set(true)
+
+            afterEvaluate {
+                frameworks.forEach { adapter -> adapter.enabled.set(false) }
+            }
         }
     }
 
-    tasks.processTestResources {
-        filesMatching("**/allure.properties") {
-            filter {
-                it.replace("#project.description#", project.description ?: project.name)
+    val enableQuality = true
+    fun excludeGeneratedSources(source: FileTree): FileTree = (source - fileTree("build/generated-sources")).asFileTree
+
+    checkstyle {
+        toolVersion = dependencyManagement.managedVersions["com.puppycrawl.tools:checkstyle"]!!
+        configDirectory = rootProject.layout.projectDirectory.dir("gradle/quality-configs/checkstyle")
+    }
+
+    pmd {
+        toolVersion = dependencyManagement.managedVersions["net.sourceforge.pmd:pmd-java"]!!
+        ruleSets = listOf()
+        ruleSetFiles = rootProject.files("gradle/quality-configs/pmd/pmd.xml")
+    }
+
+    spotbugs {
+        toolVersion = dependencyManagement.managedVersions["com.github.spotbugs:spotbugs"]!!
+        excludeFilter = rootProject.file("gradle/quality-configs/spotbugs/exclude.xml")
+
+        afterEvaluate {
+            val spotbugs = configurations.findByName("spotbugs")
+            if (spotbugs != null) {
+                dependencies {
+                    spotbugs("org.slf4j:slf4j-simple")
+                    spotbugs("com.github.spotbugs:spotbugs")
+                }
             }
         }
     }
 
-    configure<QualityExtension> {
-        configDir = qualityConfigsDir
-        checkstyleVersion = "8.22"
-        pmdVersion = "6.17.0"
-        spotbugsVersion = "3.1.12"
-        codenarcVersion = "1.4"
-        enabled = !project.hasProperty("disableQuality")
+    tasks.withType(Checkstyle::class) {
+        source = excludeGeneratedSources(source)
+        enabled = enableQuality
+    }
+
+    tasks.withType(Pmd::class) {
+        source = excludeGeneratedSources(source)
+        enabled = enableQuality
+    }
+
+    tasks.withType(SpotBugsTask::class) {
+        enabled = enableQuality
+    }
+
+    tasks.checkstyleTest {
+        enabled = false
+    }
+
+    tasks.pmdTest {
+        enabled = false
+    }
+
+    tasks.spotbugsTest {
+        enabled = false
     }
 
-    configure<SpotlessExtension> {
+    spotless {
         java {
-            target(fileTree(rootDir) {
-                include("src/**/*.java")
-                exclude("**/generated-sources/**/*.*")
-            })
+            target("src/**/*.java")
             removeUnusedImports()
-            @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|import|open|module|//startfile)")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
         }
         scala {
-            target(fileTree(rootDir) {
-                include("**/src/**/*.scala")
-            })
-            @Suppress("INACCESSIBLE_TYPE")
+            target("src/**/*.scala")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile)")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
         }
         groovy {
-            target(fileTree(rootDir) {
-                include("**/src/**/*.groovy")
-            })
-            @Suppress("INACCESSIBLE_TYPE")
+            target("src/**/*.groovy")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile) ")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
         }
         format("misc") {
-            target(fileTree(rootDir) {
-                include("**/*.gradle",
-                        "**/*.gitignore",
-                        "README.md",
-                        "CONTRIBUTING.md",
-                        "config/**/*.xml",
-                        "src/**/*.xml")
-            })
+            target(
+                "*.gradle",
+                "*.gitignore",
+                "README.md",
+                "CONTRIBUTING.md",
+                "config/**/*.xml",
+                "src/**/*.xml"
+            )
             trimTrailingWhitespace()
             endWithNewline()
         }
         encoding("UTF-8")
     }
 
-    configure<AllureExtension> {
-        autoconfigure = false
-        aspectjweaver = false
-    }
-
-    val sourceJar by tasks.creating(Jar::class) {
-        from(sourceSets.getByName("main").allSource)
-        archiveClassifier.set("sources")
-    }
-
-    val javadocJar by tasks.creating(Jar::class) {
-        from(tasks.getByName("javadoc"))
-        archiveClassifier.set("javadoc")
+    java {
+        withJavadocJar()
+        withSourcesJar()
     }
 
     tasks.withType(Javadoc::class) {
-        (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
+        (options as StandardJavadocDocletOptions).apply {
+            addStringOption("Xdoclint:none", "-quiet")
+        }
     }
 
-    artifacts.add("archives", sourceJar)
-    artifacts.add("archives", javadocJar)
-
-    val bintrayUpload by tasks.existing
-    afterReleaseBuild {
-        dependsOn(bintrayUpload)
+    publishing.publications.named<MavenPublication>("maven") {
+        pom {
+            from(components["java"])
+        }
     }
 
-    repositories {
-        jcenter()
-        mavenLocal()
+    val allDepsInsight by tasks.creating(DependencyInsightReportTask::class) {
+        showingAllVariants.set(true)
     }
 }
 
 allure {
-    version = "2.9.0"
-    autoconfigure = false
-    aspectjweaver = false
+    version.set("2.19.0")
 }
 
-val aggregatedReport by tasks.creating(AllureReport::class) {
-    clean = true
-    resultsDirs = subprojects.map { file("${it.buildDir}/allure-results") }.filter { it.exists() }
+repositories {
+    mavenLocal()
+    mavenCentral()
 }
diff --git a/gradle.properties b/gradle.properties
index fe032911a..40a54c453 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,12 @@
-version=2.13.4-SNAPSHOT
+version=2.33-SNAPSHOT
+
 org.gradle.daemon=true
-org.gradle.parallel=true
\ No newline at end of file
+org.gradle.parallel=true
+org.gradle.warning.mode=none
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m
+
+test.maxHeapSize=512m
+test.maxParallelForks=4
+
+# https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
+kotlin.stdlib.default.dependency=false
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
deleted file mode 100644
index 60e005f04..000000000
--- a/gradle/bintray.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-
-    configurations = ['archives']
-
-    publish = true
-    pkg {
-        userOrg = 'qameta'
-        repo = 'maven'
-        name = 'allure-java'
-        desc = 'Allure Java integrations'
-        websiteUrl = 'https://github.com/allure-framework/allure-java'
-        issueTrackerUrl = 'https://github.com/allure-framework/allure-java'
-        vcsUrl = 'https://github.com/allure-framework/allure-java.git'
-        licenses = ['Apache-2.0']
-
-        githubRepo = 'allure-framework/allure-java'
-        githubReleaseNotesFile = 'README.md'
-
-        version {
-            name = project.version
-            released = new Date()
-            gpg {
-                sign = true
-            }
-        }
-    }
-}
diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle
deleted file mode 100644
index 7543a22be..000000000
--- a/gradle/maven-publish.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-apply plugin: 'maven'
-
-install {
-    repositories.mavenInstaller {
-        customizePom(pom, project)
-    }
-}
-
-def customizePom(pom, gradleProject) {
-    pom.whenConfigured { generatedPom ->
-        // eliminate testng-scoped dependencies (no need in maven central poms)
-        generatedPom.dependencies.removeAll { dep ->
-            dep.scope == "test"
-        }
-
-        // sort to make pom dependencies order consistent to ease comparison of older poms
-        generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
-            "$dep.scope:$dep.groupId:$dep.artifactId"
-        }
-
-        // add all items necessary for maven central publication
-        generatedPom.project {
-            name = gradleProject.description
-            description = gradleProject.description
-            url = "https://github.com/allure-framework/allure-java"
-            organization {
-                name = "Qameta IO"
-                url = "https://qameta.io"
-            }
-            licenses {
-                license {
-                    name = 'The Apache Software License, Version 2.0'
-                    url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    distribution = 'repo'
-                }
-            }
-            scm {
-                url = 'https://github.com/allure-framework/allure-java'
-                connection = 'scm:git:git://github.com/allure-framework/allure-java'
-                developerConnection = 'scm:git:git://github.com/allure-framework/allure-java'
-            }
-            developers {
-                developer {
-                    id = 'baev'
-                    name = 'Dmitry Baev'
-                    email = 'baev@qameta.io'
-                }
-            }
-            issueManagement {
-                system = 'Github Issues'
-                url = 'https://github.com/allure-framework/allure-java/issues'
-            }
-        }
-    }
-}
diff --git a/gradle/quality-configs/checkstyle/checkstyle.xml b/gradle/quality-configs/checkstyle/checkstyle.xml
index 507c4e845..8e3f80a29 100644
--- a/gradle/quality-configs/checkstyle/checkstyle.xml
+++ b/gradle/quality-configs/checkstyle/checkstyle.xml
@@ -20,6 +20,10 @@
     <module name="Translation"/>
     <module name="UniqueProperties"/>
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
+
     <module name="TreeWalker">
         <!-- http://checkstyle.sourceforge.net/config_filters.html#SuppressionCommentFilter -->
         <module name="SuppressionCommentFilter"/>
@@ -40,7 +44,7 @@
         <module name="EmptyBlock"/>
         <module name="EmptyCatchBlock"/>
         <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
+        <!--        <module name="NeedBraces"/>-->
         <module name="RightCurly"/>
 
 
@@ -82,7 +86,9 @@
         <!--<module name="MissingCtor"/>-->
         <module name="MissingSwitchDefault"/>
         <module name="ModifiedControlVariable"/>
-        <module name="MultipleStringLiterals"/>
+        <module name="MultipleStringLiterals">
+            <property name="ignoreStringsRegexp" value='^(("")|(", ")|("\\n")|("\\t")|(" "))$'/>
+        </module>
         <module name="MultipleVariableDeclarations"/>
         <module name="NestedForDepth">
             <property name="max" value="2"/>
@@ -121,7 +127,7 @@
 
 
         <!-- Imports (http://checkstyle.sourceforge.net/config_imports.html) -->
-        <!--<module name="AvoidStarImport"/>-->
+        <module name="AvoidStarImport"/>
         <!--<module name="AvoidStaticImport"/>-->
         <!--<module name="CustomImportOrder"/>-->
         <module name="IllegalImport"/>
@@ -148,10 +154,10 @@
 
         <!-- Metrics (http://checkstyle.sourceforge.net/config_metrics.html) -->
         <module name="BooleanExpressionComplexity"/>
-        <module name="ClassDataAbstractionCoupling"/>
-        <module name="ClassFanOutComplexity"/>
+        <!--        <module name="ClassDataAbstractionCoupling"/>-->
+        <!--        <module name="ClassFanOutComplexity"/>-->
         <module name="CyclomaticComplexity"/>
-        <module name="JavaNCSS"/>
+        <!--        <module name="JavaNCSS"/>-->
         <module name="NPathComplexity"/>
 
 
@@ -207,10 +213,7 @@
 
         <!-- Size Violations (http://checkstyle.sourceforge.net/config_sizes.html) -->
         <module name="AnonInnerLength"/>
-        <module name="ExecutableStatementCount"/>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
+        <!--        <module name="ExecutableStatementCount"/>-->
         <module name="MethodCount"/>
         <module name="MethodLength"/>
         <module name="OuterTypeNumber"/>
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index c29cb9780..a3c7ca8bf 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -15,23 +15,19 @@
         <exclude name="AccessorMethodGeneration"/>
         <exclude name="ArrayIsStoredDirectly"/>
         <exclude name="GuardLogStatement"/>
-        <exclude name="JUnitAssertionsShouldIncludeMessage"/>
-        <exclude name="JUnit4SuitesShouldUseSuiteAnnotation"/>
-        <exclude name="JUnitTestsShouldIncludeAssert"/>
-        <exclude name="JUnit4TestShouldUseBeforeAnnotation"/>
-        <exclude name="JUnit4TestShouldUseAfterAnnotation"/>
-        <exclude name="JUnit4TestShouldUseTestAnnotation"/>
+        <!--  Doesn't work with Java 8 switch clause  -->
+        <exclude name="ExhaustiveSwitchHasDefault"/>
     </rule>
 
 
     <!-- Code style (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_codestyle.html) -->
     <rule ref="category/java/codestyle.xml">
-        <exclude name="AbstractNaming"/>
         <exclude name="AtLeastOneConstructor"/>
-        <exclude name="AvoidFinalLocalVariable"/>
         <exclude name="CallSuperInConstructor"/>
         <exclude name="CommentDefaultAccessModifier"/>
         <exclude name="ConfusingTernary"/>
+        <exclude name="GenericsNaming"/>
+        <exclude name="LinguisticNaming"/>
         <exclude name="LocalHomeNamingConvention"/> <!-- earlier j2ee group-->
         <exclude name="LocalInterfaceSessionNamingConvention"/> <!-- earlier j2ee group-->
         <exclude name="LocalVariableCouldBeFinal"/>
@@ -44,58 +40,41 @@
         <exclude name="ShortMethodName"/>
         <exclude name="ShortVariable"/>
         <exclude name="TooManyStaticImports"/>
+        <exclude name="UnnecessaryAnnotationValueElement"/>
+        <exclude name="UseDiamondOperator"/>
         <exclude name="UselessParentheses"/>
-    </rule>
-
-    <rule ref="category/java/codestyle.xml/LinguisticNaming">
-        <properties>
-            <property name="checkSetters" value="false"/>
-        </properties>
+        <exclude name="BooleanGetMethodName"/>
+        <exclude name="ClassNamingConventions"/>
     </rule>
 
     <!-- Design (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_design.html) -->
     <rule ref="category/java/design.xml">
         <exclude name="AvoidCatchingGenericException"/>
+        <exclude name="CouplingBetweenObjects"/>
         <exclude name="DataClass"/>
-        <exclude name="ExcessiveClassLength"/> <!-- replaced by NcssCount -->
         <exclude name="ExcessiveImports"/>
-        <exclude name="ExcessiveMethodLength"/> <!-- replaced by NcssCount -->
         <exclude name="LawOfDemeter"/>
+        <exclude name="CyclomaticComplexity"/> <!-- disabled in favour of checkstyle's CyclomaticComplexity check -->
         <exclude name="LoosePackageCoupling"/>
-        <exclude name="ModifiedCyclomaticComplexity"/>
         <exclude name="SignatureDeclareThrowsException"/>
-        <exclude name="StdCyclomaticComplexity"/>
         <exclude name="TooManyFields"/>
+        <exclude name="GodClass"/>
+        <exclude name="CognitiveComplexity"/>
+        <exclude name="NcssCount"/>
+        <exclude name="ExcessivePublicCount"/>
+        <exclude name="TooManyMethods"/>
+        <exclude name="ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
     </rule>
     <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
         <properties>
             <property name="problemDepth" value="4"/>
         </properties>
     </rule>
-    <rule ref="category/java/design.xml/CyclomaticComplexity">
-        <properties>
-            <property name="cycloOptions" value="ignoreBooleanPaths"/>
-            <property name="classReportLevel" value="81"/>
-            <property name="methodReportLevel" value="11"/>
-        </properties>
-    </rule>
-    <rule ref="category/java/design.xml/NcssCount">
-        <properties>
-            <property name="methodReportLevel" value="30"/>
-            <property name="classReportLevel" value="300"/>
-        </properties>
-    </rule>
     <rule ref="category/java/design.xml/NPathComplexity">
         <properties>
             <property name="reportLevel" value="201"/>
         </properties>
     </rule>
-    <rule ref="category/java/design.xml/TooManyMethods" message="Avoid classes longer than 20 methods">
-        <properties>
-            <property name="maxmethods" value="20"/>
-        </properties>
-    </rule>
-
 
     <!-- Documentation (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_documentation.html) -->
     <rule ref="category/java/documentation.xml">
@@ -107,19 +86,19 @@
     <!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_errorprone.html) -->
     <rule ref="category/java/errorprone.xml">
         <exclude name="AvoidCatchingThrowable"/>
-        <exclude name="BeanMembersShouldSerialize"/>
-        <exclude name="DataflowAnomalyAnalysis"/>
-        <exclude name="DoNotCallSystemExit"/> <!-- earlier j2ee group-->
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AssignmentInOperand"/>  <!-- duplicate of checkstyle check AssignmentInOperand -->
+        <exclude name="AvoidLiteralsInIfCondition"/>
         <exclude name="EmptyFinalizer"/>
-        <exclude name="FinalizeOnlyCallsSuperFinalize"/>
         <exclude name="FinalizeDoesNotCallSuperFinalize"/>
+        <exclude name="FinalizeOnlyCallsSuperFinalize"/>
         <exclude name="JUnitSpelling"/>
         <exclude name="JUnitStaticSuite"/>
-        <exclude name="InvalidSlf4jMessageFormat"/>
-        <exclude name="LoggerIsNotStaticFinal"/>
         <exclude name="MissingSerialVersionUID"/>
-        <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
+        <exclude
+                name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
         <exclude name="StaticEJBFieldShouldBeFinal"/> <!-- earlier j2ee group-->
+        <exclude name="TestClassWithoutTestCases"/>
         <exclude name="UseCorrectExceptionLogging"/>
         <exclude name="UseLocaleWithCaseConversions"/>
         <exclude name="UseProperClassLoader"/> <!-- earlier j2ee group-->
@@ -129,11 +108,6 @@
             <property name="skipAnnotations" value="true"/>
         </properties>
     </rule>
-    <rule ref="category/java/errorprone.xml/CloseResource">
-        <properties>
-            <property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet" />
-        </properties>
-    </rule>
 
 
     <!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_multithreading.html) -->
@@ -144,10 +118,11 @@
 
 
     <!-- Performance (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_performance.html) -->
-    <rule ref="category/java/performance.xml"/>
-
+    <rule ref="category/java/performance.xml">
+        <exclude name="AvoidInstantiatingObjectsInLoops"/>
+    </rule>
 
     <!-- Security (no rules) -->
     <rule ref="category/java/security.xml"/>
 
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/gradle/quality-configs/spotbugs/exclude.xml b/gradle/quality-configs/spotbugs/exclude.xml
index 69e9c65e2..f942c310b 100644
--- a/gradle/quality-configs/spotbugs/exclude.xml
+++ b/gradle/quality-configs/spotbugs/exclude.xml
@@ -6,6 +6,9 @@
     <Match>
         <Source name="~.*\.groovy"/>
     </Match>
+    <Match>
+        <Source name="~.*\.scala"/>
+    </Match>
 
     <!-- Disable check -->
     <Match>
@@ -13,7 +16,7 @@
          you will have to use @NotNull annotation, which contradict with original contract
          (actually not, because guava intend weaker semantics). So disable this check to be able to properly
          use nullability annotations -->
-        <Bug pattern="NP_METHOD_PARAMETER_TIGHTENS_ANNOTATION" />
+        <Bug pattern="NP_METHOD_PARAMETER_TIGHTENS_ANNOTATION"/>
     </Match>
     <Match>
         <!-- Disabled as confusing check (very misleading description) and also not so useful -->
@@ -29,9 +32,26 @@
     <Match>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
         <And>
-            <Class name="io.qameta.allure.util.PropertiesUtils" />
+            <Class name="io.qameta.allure.util.PropertiesUtils"/>
             <Method name="loadPropertiesFrom"/>
         </And>
     </Match>
 
+    <Match>
+        <Bug pattern="EI_EXPOSE_REP"/>
+    </Match>
+    <Match>
+        <Bug pattern="EI_EXPOSE_REP2"/>
+    </Match>
+    <Match>
+        <Bug pattern="EI_EXPOSE_STATIC_REP2"/>
+    </Match>
+    <Match>
+        <Bug pattern="MS_EXPOSE_REP"/>
+    </Match>
+
+    <Match>
+        <Class name="io.qameta.allure.junit4.AllureJunit4Utils$UniqueIdExtract"/>
+    </Match>
+
 </FindBugsFilter>
diff --git a/gradle/quality-configs/spotless/header.java b/gradle/quality-configs/spotless/header.java
index e42de8108..a91c27d5a 100644
--- a/gradle/quality-configs/spotless/header.java
+++ b/gradle/quality-configs/spotless/header.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright $YEAR Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- */
\ No newline at end of file
+ */
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf01..249e5832f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4b442974..a59520664 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708ff2..a69d9cb6c 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
 fi
 
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 6d57edc70..53a6b238d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,84 +1,91 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle.kts b/settings.gradle.kts
index aca806286..5dfda5657 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,32 +2,77 @@ rootProject.name = "allure-java"
 
 include("allure-assertj")
 include("allure-attachments")
+include("allure-awaitility")
+include("allure-bom")
 include("allure-citrus")
-include("allure-cucumber-jvm")
-include("allure-cucumber2-jvm")
-include("allure-cucumber3-jvm")
 include("allure-cucumber4-jvm")
 include("allure-cucumber5-jvm")
+include("allure-cucumber6-jvm")
+include("allure-cucumber7-jvm")
 include("allure-descriptions-javadoc")
+include("allure-grpc")
+include("allure-hamcrest")
 include("allure-httpclient")
+include("allure-httpclient5")
 include("allure-java-commons")
 include("allure-java-commons-test")
-include("allure-java-migration")
 include("allure-jax-rs")
 include("allure-jbehave")
+include("allure-jbehave5")
+include("allure-jooq")
 include("allure-jsonunit")
 include("allure-junit-platform")
 include("allure-junit4")
 include("allure-junit4-aspect")
 include("allure-junit5")
+include("allure-junit5-assert")
+include("allure-karate")
 include("allure-model")
 include("allure-okhttp")
 include("allure-okhttp3")
+include("allure-reader")
 include("allure-rest-assured")
 include("allure-scalatest")
 include("allure-selenide")
 include("allure-servlet-api")
 include("allure-spock")
+include("allure-spock2")
 include("allure-spring-web")
+include("allure-test-filter")
 include("allure-testng")
-include("allure-junit5-assert")
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+    plugins {
+        id("com.diffplug.spotless") version "6.25.0"
+        id("io.github.goooler.shadow") version "8.1.8"
+        id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
+        id("io.qameta.allure-adapter") version "3.0.1"
+        id("io.qameta.allure-aggregate-report") version "3.0.1"
+        id("io.qameta.allure-download") version "3.0.1"
+        id("io.qameta.allure-report") version "3.0.1"
+        id("io.spring.dependency-management") version "1.1.7"
+        id("com.google.protobuf") version "0.9.5"
+        id("com.github.spotbugs") version "6.4.7"
+        kotlin("jvm") version "2.0.0"
+    }
+}
+
+plugins {
+    id("com.gradle.develocity") version "3.17.5" apply false
+}
+
+val isCiServer = System.getenv().containsKey("CI")
+
+if (isCiServer) {
+    apply(plugin = "com.gradle.develocity")
+    develocity {
+        buildScan {
+            termsOfUseUrl = "https://gradle.com/terms-of-service"
+            termsOfUseAgree = "yes"
+            tag("CI")
+        }
+    }
+}