diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5a5e6e91..ec5ea734 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -171,7 +171,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        path: [async-std, tokio, actix_example, actix4_example, rocket_example]
+        path: [basic, actix_example, actix4_example, rocket_example]
     steps:
       - uses: actions/checkout@v2
 
@@ -187,6 +187,28 @@ jobs:
           args: >
             --manifest-path examples/${{ matrix.path }}/Cargo.toml
 
+  issues:
+    name: Issues
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        path: [86]
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: >
+            --manifest-path issues/${{ matrix.path }}/Cargo.toml
+
   sqlite:
     name: SQLite
     runs-on: ubuntu-20.04
diff --git a/examples/async-std/Cargo.toml b/examples/basic/Cargo.toml
similarity index 100%
rename from examples/async-std/Cargo.toml
rename to examples/basic/Cargo.toml
diff --git a/examples/async-std/Readme.md b/examples/basic/Readme.md
similarity index 100%
rename from examples/async-std/Readme.md
rename to examples/basic/Readme.md
diff --git a/examples/async-std/bakery.sql b/examples/basic/bakery.sql
similarity index 100%
rename from examples/async-std/bakery.sql
rename to examples/basic/bakery.sql
diff --git a/examples/async-std/import.sh b/examples/basic/import.sh
similarity index 100%
rename from examples/async-std/import.sh
rename to examples/basic/import.sh
diff --git a/examples/async-std/src/entities.rs b/examples/basic/src/entities.rs
similarity index 100%
rename from examples/async-std/src/entities.rs
rename to examples/basic/src/entities.rs
diff --git a/examples/async-std/src/example_cake.rs b/examples/basic/src/example_cake.rs
similarity index 100%
rename from examples/async-std/src/example_cake.rs
rename to examples/basic/src/example_cake.rs
diff --git a/examples/async-std/src/example_cake_filling.rs b/examples/basic/src/example_cake_filling.rs
similarity index 100%
rename from examples/async-std/src/example_cake_filling.rs
rename to examples/basic/src/example_cake_filling.rs
diff --git a/examples/async-std/src/example_filling.rs b/examples/basic/src/example_filling.rs
similarity index 100%
rename from examples/async-std/src/example_filling.rs
rename to examples/basic/src/example_filling.rs
diff --git a/examples/async-std/src/example_fruit.rs b/examples/basic/src/example_fruit.rs
similarity index 100%
rename from examples/async-std/src/example_fruit.rs
rename to examples/basic/src/example_fruit.rs
diff --git a/examples/async-std/src/main.rs b/examples/basic/src/main.rs
similarity index 100%
rename from examples/async-std/src/main.rs
rename to examples/basic/src/main.rs
diff --git a/examples/async-std/src/operation.rs b/examples/basic/src/operation.rs
similarity index 100%
rename from examples/async-std/src/operation.rs
rename to examples/basic/src/operation.rs
diff --git a/examples/async-std/src/select.rs b/examples/basic/src/select.rs
similarity index 100%
rename from examples/async-std/src/select.rs
rename to examples/basic/src/select.rs
diff --git a/examples/tokio/Cargo.toml b/issues/86/Cargo.toml
similarity index 100%
rename from examples/tokio/Cargo.toml
rename to issues/86/Cargo.toml
diff --git a/examples/tokio/src/cake.rs b/issues/86/src/cake.rs
similarity index 100%
rename from examples/tokio/src/cake.rs
rename to issues/86/src/cake.rs
diff --git a/examples/tokio/src/main.rs b/issues/86/src/main.rs
similarity index 100%
rename from examples/tokio/src/main.rs
rename to issues/86/src/main.rs