diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
deleted file mode 100644
index e9a6baa..0000000
--- a/.github/workflows/installer.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-name: Test install-poetry.py
-
-on:
-  push:
-    paths:
-      - 'install-poetry.py'
-      - '.github/workflows/installer.yml'
-    branches:
-      - main
-  pull_request:
-    paths:
-      - 'install-poetry.py'
-      - '.github/workflows/installer.yml'
-    branches:
-      - '**'
-
-concurrency:
-  group: installer-${{ github.head_ref || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  default:
-    name: ${{ matrix.os }} / ${{ matrix.python-version }} / install-poetry.py ${{ matrix.args }}
-    runs-on: ${{ matrix.image }}
-    strategy:
-      matrix:
-        os: [Ubuntu, macOS, Windows]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
-        args:
-          - ""
-          - "--preview"
-          - "--git https://github.com/python-poetry/poetry.git"
-          - "--version 1.1.15"
-          - "--version 1.2.0"
-        include:
-          - os: Ubuntu
-            image: ubuntu-22.04
-          - os: Windows
-            image: windows-2022
-          - os: macOS
-            image: macos-12
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Update PATH
-        if: ${{ matrix.os != 'Windows' }}
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Update PATH for Windows
-        if: ${{ matrix.os == 'Windows' }}
-        run: echo "$APPDATA\Python\Scripts" >> $GITHUB_PATH
-
-      - name: Install Poetry
-        run: python install-poetry.py -y
-
-      - name: Upload Failure Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: poetry-installer-error.log
-          path: poetry-installer-error-*.log
-
-      - name: Verify Installation
-        run: |
-          set -e
-          poetry new foobar
-          cd foobar
-          poetry config virtualenvs.in-project true
-          poetry env use python
-          [ "$(poetry run python --version)" == "$(python --version)" ] \
-            || { echo >&2 "ERROR: Virtual environment Python version do not match system version." && exit 1; }
-
-      - name: Uninstall Poetry
-        run: |
-          python install-poetry.py -y --uninstall
-          { type poetry 2>/dev/null >&2 && exit 1; } || exit 0
-
-  # debian/ubuntu needs special testing due to various issues around python packaging
-  # and configuration
-  integration-ubuntu:
-    name: Integration Test / Ubuntu / ${{ matrix.tag }}
-    runs-on: ubuntu-latest
-    container: docker.io/ubuntu:${{ matrix.tag }}
-    strategy:
-      matrix:
-        tag:
-          - focal
-          - jammy
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install Packages
-        run: |
-          apt-get -y update
-          apt-get -y install python3 ca-certificates
-          apt-get -y install --reinstall python3-distutils
-
-      - name: Update PATH
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Install Poetry
-        env:
-          DEB_PYTHON_INSTALL_LAYOUT: "deb"
-        run: python3 install-poetry.py -y
-
-      - name: Upload Failure Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: poetry-installer-error.log
-          path: poetry-installer-error-*.log
-
-      - name: Verify Installation
-        run: |
-          set -e
-          poetry new foobar
-          cd foobar
-          poetry config virtualenvs.in-project true
-          poetry env use python3
-          [ "$(poetry run python --version)" == "$(python3 --version)" ] \
-            || { echo >&2 "ERROR: Virtual environment Python version do not match system version." && exit 1; }
-
-      - name: Uninstall Poetry
-        run: |
-          python3 install-poetry.py -y --uninstall
-          { type poetry 2>/dev/null >&2 && exit 1; } || exit 0
diff --git a/.github/workflows/support-matrix.yml b/.github/workflows/support-matrix.yml
new file mode 100644
index 0000000..b6966d7
--- /dev/null
+++ b/.github/workflows/support-matrix.yml
@@ -0,0 +1,98 @@
+name: Support Matrix
+
+on:
+  push:
+    paths:
+      - 'install-poetry.py'
+      - '.github/workflows/support-matrix.yml'
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'install-poetry.py'
+      - '.github/workflows/support-matrix.yml'
+    branches:
+      - '**'
+
+concurrency:
+  group: installer-${{ github.head_ref || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  feature-matrix:
+    name: ${{ matrix.python-version }} /  ${{ matrix.args }}
+    runs-on: ubuntu-22.04
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        args:
+          - ""
+          - "--version 1.1.15"
+          - "--version 1.2.0"
+          - "--preview"
+          - "--git https://github.com/python-poetry/poetry.git"
+          - "--path ./poetry"
+        include:
+          - args: "--version 1.1.15"
+            python-version: "3.6"
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/checkout@v3
+        with:
+          repository: python-poetry/poetry
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Poetry
+        run: python install-poetry.py -y ${{ matrix.args }}
+
+      - name: Upload Failure Log
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: poetry-installer-error.log
+          path: poetry-installer-error-*.log
+
+      - name: Update PATH
+        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Test existing project
+        run: |
+          set -e
+          cd poetry
+
+          poetry install
+          poetry build
+          poetry run poetry --version
+          poetry run poetry debug info
+
+      - name: Test new project
+        run: |
+          set -e
+          poetry new test_project
+          cd test_project
+
+          poetry env use python3
+
+          if [ "$(poetry run python --version)" != "$(python3 --version)" ]; then
+            echo "ERROR: Virtual environment Python version does not match expected system version" >&2
+            exit 1
+          fi
+
+      - name: Uninstall Poetry
+        run: |
+          set -e
+          python install-poetry.py -y --uninstall
+          if command -v "poetry" >/dev/null; then
+            which poetry
+            echo "ERROR: Failed to uninstall Poetry?" >&2
+            exit 1
+          fi