diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 5284a088..be77818e 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -24,9 +24,9 @@ jobs:
     name: Check linting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
       - name: Display Python version
@@ -37,7 +37,7 @@ jobs:
         run: python -m pip install tox
       - name: Set PY
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
@@ -61,9 +61,9 @@ jobs:
       python-version: ["3.8"]
       cloud-provider: [aws, azure, gcp]
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Display Python version
@@ -85,16 +85,68 @@ jobs:
       run: python -m tox -e "py${PYTHON_VERSION/\./}" --skip-missing-interpreters false
       env:
         PYTHON_VERSION: ${{ matrix.python-version }}
-        PYTEST_ADDOPTS: -vvv --color=yes --tb=short
+        PYTEST_ADDOPTS: -vvv --color=yes --tb=long
     - name: Combine coverages
       run: python -m tox -e coverage --skip-missing-interpreters false
       shell: bash
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: coverage_${{ matrix.os.download_name }}-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
         path: |
           .tox/.coverage
           .tox/coverage.xml
+  test_sqlalchemy_v2:
+   name: SQLAlchemy v2 test ${{ matrix.os.download_name }}-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
+   needs: lint
+   runs-on: ${{ matrix.os.image_name }}
+   strategy:
+    fail-fast: false
+    matrix:
+      os:
+       - image_name: ubuntu-latest
+         download_name: manylinux_x86_64
+       - image_name: macos-latest
+         download_name: macosx_x86_64
+       - image_name: windows-2019
+         download_name: win_amd64
+      python-version: ["3.8"]
+      cloud-provider: [aws, azure, gcp]
+   steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+    - name: Setup parameters file
+      shell: bash
+      env:
+        PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
+      run: |
+        gpg --quiet --batch --yes --decrypt --passphrase="$PARAMETERS_SECRET" \
+        .github/workflows/parameters/parameters_${{ matrix.cloud-provider }}.py.gpg > tests/parameters.py
+    - name: Upgrade setuptools, pip and wheel
+      run: python -m pip install -U setuptools pip wheel
+    - name: Install tox
+      run: python -m pip install tox
+    - name: List installed packages
+      run: python -m pip freeze
+    - name: Run tests
+      run: python -m tox -e "py${PYTHON_VERSION/\./}-sqlalchemy-v2"
+      env:
+        PYTHON_VERSION: ${{ matrix.python-version }}
+        PYTEST_ADDOPTS: -vvv --color=yes --tb=long
+    - name: Combine coverages
+      run: python -m tox -e coverage --skip-missing-interpreters false
+      shell: bash
+    - uses: actions/upload-artifact@v4
+      with:
+        name: coverage_${{ matrix.os.download_name }}-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
+        path: |
+          .tox/.coverage
+          .tox/coverage.xml
+
 
   combine-coverage:
     if: ${{ success() || failure() }}
@@ -102,12 +154,12 @@ jobs:
     needs: [test]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
       - name: Display Python version
@@ -131,15 +183,15 @@ jobs:
       - name: Combine coverages
         run: python -m tox -e coverage
       - name: Publish html coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: overall_cov_html
           path: .tox/htmlcov
       - name: Publish xml coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: overall_cov_xml
           path: .tox/coverage.xml
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
         with:
           file: .tox/coverage.xml
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 2e197168..bdb2eba1 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -12,7 +12,7 @@ jobs:
     if: ${{!contains(github.event.pull_request.labels.*.name, 'NO-CHANGELOG-UPDATES')}}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/create_req_files.yml b/.github/workflows/create_req_files.yml
index 57f7efb8..f89871eb 100644
--- a/.github/workflows/create_req_files.yml
+++ b/.github/workflows/create_req_files.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Display Python version
@@ -37,7 +37,7 @@ jobs:
       - name: Show created req file
         shell: bash
         run: cat ${{ env.requirements_file }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           path: temp_requirement
 
@@ -46,11 +46,11 @@ jobs:
     name: Commit and push files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.SNOWFLAKE_GITHUB_TOKEN }} # stored in GitHub secrets
       - name: Download requirement files
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: artifact
           path: tested_requirements
diff --git a/.github/workflows/jira_close.yml b/.github/workflows/jira_close.yml
index dfcb8bc7..1329eab1 100644
--- a/.github/workflows/jira_close.yml
+++ b/.github/workflows/jira_close.yml
@@ -9,14 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: snowflakedb/gh-actions
           ref: jira_v1
           token: ${{ secrets.SNOWFLAKE_GITHUB_TOKEN }} # stored in GitHub secrets
           path: .
       - name: Jira login
-        uses: atlassian/gajira-login@master
+        uses: atlassian/gajira-login@v3
         env:
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
diff --git a/.github/workflows/jira_comment.yml b/.github/workflows/jira_comment.yml
index 954929fa..8533c14c 100644
--- a/.github/workflows/jira_comment.yml
+++ b/.github/workflows/jira_comment.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Jira login
-        uses: atlassian/gajira-login@master
+        uses: atlassian/gajira-login@v3
         env:
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
@@ -22,7 +22,7 @@ jobs:
           jira=$(echo -n $TITLE | awk '{print $1}' | sed -e 's/://')
           echo ::set-output name=jira::$jira
       - name: Comment on issue
-        uses: atlassian/gajira-comment@master
+        uses: atlassian/gajira-comment@v3
         if: startsWith(steps.extract.outputs.jira, 'SNOW-')
         with:
           issue: "${{ steps.extract.outputs.jira }}"
diff --git a/.github/workflows/jira_issue.yml b/.github/workflows/jira_issue.yml
index 74e58454..a1bab591 100644
--- a/.github/workflows/jira_issue.yml
+++ b/.github/workflows/jira_issue.yml
@@ -14,7 +14,7 @@ jobs:
     if: ((github.event_name == 'issue_comment' && github.event.comment.body == 'recreate jira' && github.event.comment.user.login == 'sfc-gh-mkeller') || (github.event_name == 'issues' && github.event.pull_request.user.login != 'whitesource-for-github-com[bot]'))
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: snowflakedb/gh-actions
           ref: jira_v1
@@ -22,7 +22,7 @@ jobs:
           path: .
 
       - name: Login
-        uses: atlassian/gajira-login@v2.0.0
+        uses: atlassian/gajira-login@v3
         env:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
           JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
@@ -30,7 +30,7 @@ jobs:
 
       - name: Create JIRA Ticket
         id: create
-        uses: atlassian/gajira-create@v2.0.1
+        uses: atlassian/gajira-create@v3
         with:
           project: SNOW
           issuetype: Bug
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index dd1e1ba6..c801ffa5 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -21,9 +21,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
@@ -33,7 +33,7 @@ jobs:
     - name: Build package
       run: python -m build
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1
+      uses: pypa/gh-action-pypi-publish@e53eb8b103ffcb59469888563dc324e3c8ba6f06
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/snyk-issue.yml b/.github/workflows/snyk-issue.yml
index c8f5d90b..497c5838 100644
--- a/.github/workflows/snyk-issue.yml
+++ b/.github/workflows/snyk-issue.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Action
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: snowflakedb/whitesource-actions
         token: ${{ secrets.whitesource_action_token }}
diff --git a/.github/workflows/snyk-pr.yml b/.github/workflows/snyk-pr.yml
index b951af65..cee9e7b9 100644
--- a/.github/workflows/snyk-pr.yml
+++ b/.github/workflows/snyk-pr.yml
@@ -15,13 +15,13 @@ jobs:
     if: ${{ github.event.pull_request.user.login == 'sfc-gh-snyk-sca-sa' }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.ref }}
         fetch-depth: 0
 
     - name: Checkout Action
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: snowflakedb/whitesource-actions
         token: ${{ secrets.whitesource_action_token }}
diff --git a/.github/workflows/stale_issue_bot.yml b/.github/workflows/stale_issue_bot.yml
index 6d76e9f4..4ee56ff8 100644
--- a/.github/workflows/stale_issue_bot.yml
+++ b/.github/workflows/stale_issue_bot.yml
@@ -10,7 +10,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v9
         with:
           close-issue-message: 'To clean up and re-prioritize bugs and feature requests we are closing all issues older than 6 months as of Apr 1, 2023. If there are any issues or feature requests that you would like us to address, please re-create them. For urgent issues, opening a support case with this link [Snowflake Community](https://community.snowflake.com/s/article/How-To-Submit-a-Support-Case-in-Snowflake-Lodge) is the fastest way to get a response'
           days-before-issue-stale: ${{ inputs.staleDays }}
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 422fe807..4c50bf1a 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -9,6 +9,10 @@ Source code is also available at:
 
 # Release Notes
 
+- v1.6.0(Not released)
+
+  - support for installing with SQLAlchemy 2.0.x
+
 - 1.5.2
 
   - Add support for sequence ordering in tests
diff --git a/pyproject.toml b/pyproject.toml
index 907176c3..b992d8e9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,90 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "snowflake-sqlalchemy"
+dynamic = ["version"]
+description = "Snowflake SQLAlchemy Dialect"
+readme = "README.md"
+license = "Apache-2.0"
+requires-python = ">=3.8"
+authors = [
+  { name = "Snowflake Inc.", email = "triage-snowpark-python-api-dl@snowflake.com" },
+]
+keywords = ["Snowflake", "analytics", "cloud", "database", "db", "warehouse"]
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Console",
+  "Environment :: Other Environment",
+  "Intended Audience :: Developers",
+  "Intended Audience :: Education",
+  "Intended Audience :: Information Technology",
+  "Intended Audience :: System Administrators",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: SQL",
+  "Topic :: Database",
+  "Topic :: Scientific/Engineering :: Information Analysis",
+  "Topic :: Software Development",
+  "Topic :: Software Development :: Libraries",
+  "Topic :: Software Development :: Libraries :: Application Frameworks",
+  "Topic :: Software Development :: Libraries :: Python Modules",
+]
+dependencies = ["snowflake-connector-python", "sqlalchemy<2.0.0,>=1.4.0"]
+
+[project.optional-dependencies]
+development = [
+  "mock",
+  "numpy",
+  "pytest",
+  "pytest-cov",
+  "pytest-rerunfailures",
+  "pytest-timeout",
+  "pytz",
+  "pre-commit",
+]
+pandas = ["snowflake-connector-python[pandas]"]
+
+[project.entry-points."sqlalchemy.dialects"]
+snowflake = "snowflake.sqlalchemy:dialect"
+
+[project.urls]
+Changelog = "https://github.com/snowflakedb/snowflake-sqlalchemy/blob/main/DESCRIPTION.md"
+Documentation = "https://docs.snowflake.com/en/user-guide/sqlalchemy.html"
+Homepage = "https://www.snowflake.com/"
+Issues = "https://github.com/snowflakedb/snowflake-sqlalchemy/issues"
+Source = "https://github.com/snowflakedb/snowflake-sqlalchemy"
+
+[tool.hatch.version]
+path = "src/snowflake/sqlalchemy/version.py"
+
+[tool.hatch.envs.local]
+features = ["development", "pandas"]
+python = "3.8"
+
+[tool.hatch.envs.local2]
+features = ["development", "pandas"]
+python = "3.8"
+post-install-commands = ["pip install -U pip", "pip install -U sqlalchemy"]
+
+[tool.hatch.build.targets.sdist]
+exclude = ["/.github"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/snowflake"]
+
+[tool.sqla_testing]
+requirement_cls = "snowflake.sqlalchemy.requirements:Requirements"
+profile_file = "tests/profiles.txt"
+
 [tool.ruff]
 line-length = 88
 
diff --git a/setup.cfg b/setup.cfg
index 04011f04..7924cc57 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,80 +1,3 @@
-[bdist_wheel]
-universal = 1
-
-[metadata]
-name = snowflake-sqlalchemy
-description = Snowflake SQLAlchemy Dialect
-long_description = file: DESCRIPTION.md
-long_description_content_type = text/markdown
-url = https://www.snowflake.com/
-author = Snowflake, Inc
-author_email = triage-snowpark-python-api-dl@snowflake.com
-license = Apache-2.0
-license_files = LICENSE.txt
-classifiers =
-    Development Status :: 5 - Production/Stable
-    Environment :: Console
-    Environment :: Other Environment
-    Intended Audience :: Developers
-    Intended Audience :: Education
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: OS Independent
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: SQL
-    Topic :: Database
-    Topic :: Scientific/Engineering :: Information Analysis
-    Topic :: Software Development
-    Topic :: Software Development :: Libraries
-    Topic :: Software Development :: Libraries :: Application Frameworks
-    Topic :: Software Development :: Libraries :: Python Modules
-keywords = Snowflake db database cloud analytics warehouse
-project_urls =
-    Documentation=https://docs.snowflake.com/en/user-guide/sqlalchemy.html
-    Source=https://github.com/snowflakedb/snowflake-sqlalchemy
-    Issues=https://github.com/snowflakedb/snowflake-sqlalchemy/issues
-    Changelog=https://github.com/snowflakedb/snowflake-sqlalchemy/blob/main/DESCRIPTION.md
-
-[options]
-python_requires = >=3.7
-packages = find_namespace:
-install_requires =
-    importlib-metadata;python_version<"3.8"
-    sqlalchemy<2.0.0,>=1.4.0
-; Keep in sync with extras dependency
-    snowflake-connector-python<4.0.0
-include_package_data = True
-package_dir =
-    =src
-zip_safe = False
-
-[options.packages.find]
-where = src
-include = snowflake.*
-
-[options.entry_points]
-sqlalchemy.dialects =
-    snowflake=snowflake.sqlalchemy:dialect
-
-[options.extras_require]
-development =
-    pytest
-    pytest-cov
-    pytest-rerunfailures
-    pytest-timeout
-    mock
-    pytz
-    numpy
-pandas =
-    snowflake-connector-python[pandas]<4.0.0
-
 [sqla_testing]
 requirement_cls=snowflake.sqlalchemy.requirements:Requirements
 profile_file=tests/profiles.txt
diff --git a/setup_.cfg b/setup_.cfg
new file mode 100644
index 00000000..db9c64b2
--- /dev/null
+++ b/setup_.cfg
@@ -0,0 +1,80 @@
+[bdist_wheel]
+universal = 1
+
+[metadata]
+name = snowflake-sqlalchemy
+description = Snowflake SQLAlchemy Dialect
+long_description = file: DESCRIPTION.md
+long_description_content_type = text/markdown
+url = https://www.snowflake.com/
+author = Snowflake, Inc
+author_email = triage-snowpark-python-api-dl@snowflake.com
+license = Apache-2.0
+license_files = LICENSE.txt
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Environment :: Console
+    Environment :: Other Environment
+    Intended Audience :: Developers
+    Intended Audience :: Education
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: OS Independent
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: SQL
+    Topic :: Database
+    Topic :: Scientific/Engineering :: Information Analysis
+    Topic :: Software Development
+    Topic :: Software Development :: Libraries
+    Topic :: Software Development :: Libraries :: Application Frameworks
+    Topic :: Software Development :: Libraries :: Python Modules
+keywords = Snowflake db database cloud analytics warehouse
+project_urls =
+    Documentation=https://docs.snowflake.com/en/user-guide/sqlalchemy.html
+    Source=https://github.com/snowflakedb/snowflake-sqlalchemy
+    Issues=https://github.com/snowflakedb/snowflake-sqlalchemy/issues
+    Changelog=https://github.com/snowflakedb/snowflake-sqlalchemy/blob/main/DESCRIPTION.md
+
+[options]
+python_requires = >=3.7
+packages = find_namespace:
+install_requires =
+    importlib-metadata;python_version<"3.8"
+    sqlalchemy<2.1.0
+; Keep in sync with extras dependency
+    snowflake-connector-python<4.0.0
+include_package_data = True
+package_dir =
+    =src
+zip_safe = False
+
+[options.packages.find]
+where = src
+include = snowflake.*
+
+[options.entry_points]
+sqlalchemy.dialects =
+    snowflake=snowflake.sqlalchemy:dialect
+
+[options.extras_require]
+development =
+    pytest
+    pytest-cov
+    pytest-rerunfailures
+    pytest-timeout
+    mock
+    pytz
+    numpy
+pandas =
+    snowflake-connector-python[pandas]<4.0.0
+
+[sqla_testing]
+requirement_cls=snowflake.sqlalchemy.requirements:Requirements
+profile_file=tests/profiles.txt
diff --git a/setup.py b/setup_.py
similarity index 75%
rename from setup.py
rename to setup_.py
index 0ec32717..bac39fef 100644
--- a/setup.py
+++ b/setup_.py
@@ -7,10 +7,10 @@
 from setuptools import setup
 
 SQLALCHEMY_SRC_DIR = os.path.join("src", "snowflake", "sqlalchemy")
-VERSION = (1, 1, 1, None)  # Default
+VERSION = "1.1.1"
 with open(os.path.join(SQLALCHEMY_SRC_DIR, "version.py"), encoding="utf-8") as f:
     exec(f.read())
-    version = ".".join([str(v) for v in VERSION if v is not None])
+    version = VERSION
 
 setup(
     version=version,
diff --git a/src/snowflake/sqlalchemy/_constants.py b/src/snowflake/sqlalchemy/_constants.py
index dad5b19b..46af4454 100644
--- a/src/snowflake/sqlalchemy/_constants.py
+++ b/src/snowflake/sqlalchemy/_constants.py
@@ -9,4 +9,4 @@
 PARAM_INTERNAL_APPLICATION_VERSION = "internal_application_version"
 
 APPLICATION_NAME = "SnowflakeSQLAlchemy"
-SNOWFLAKE_SQLALCHEMY_VERSION = ".".join([str(v) for v in VERSION if v is not None])
+SNOWFLAKE_SQLALCHEMY_VERSION = VERSION
diff --git a/src/snowflake/sqlalchemy/base.py b/src/snowflake/sqlalchemy/base.py
index 2a1bb51a..1544e258 100644
--- a/src/snowflake/sqlalchemy/base.py
+++ b/src/snowflake/sqlalchemy/base.py
@@ -13,13 +13,14 @@
 from sqlalchemy.orm import context
 from sqlalchemy.orm.context import _MapperEntity
 from sqlalchemy.schema import Sequence, Table
-from sqlalchemy.sql import compiler, expression
+from sqlalchemy.sql import compiler, expression, functions
 from sqlalchemy.sql.base import CompileState
 from sqlalchemy.sql.elements import quoted_name
 from sqlalchemy.sql.selectable import Lateral, SelectState
-from sqlalchemy.util.compat import string_types
 
+from .compat import IS_VERSION_20, args_reducer, string_types
 from .custom_commands import AWSBucket, AzureContainer, ExternalStage
+from .functions import flatten
 from .util import (
     _find_left_clause_to_join_from,
     _set_connection_interpolate_empty_sequences,
@@ -324,17 +325,9 @@ def _join_determine_implicit_left_side(
 
         return left, replace_from_obj_index, use_entity_index
 
+    @args_reducer(positions_to_drop=(6, 7))
     def _join_left_to_right(
-        self,
-        entities_collection,
-        left,
-        right,
-        onclause,
-        prop,
-        create_aliases,
-        aliased_generation,
-        outerjoin,
-        full,
+        self, entities_collection, left, right, onclause, prop, outerjoin, full
     ):
         """given raw "left", "right", "onclause" parameters consumed from
         a particular key within _join(), add a real ORMJoin object to
@@ -364,7 +357,7 @@ def _join_left_to_right(
                 use_entity_index,
             ) = self._join_place_explicit_left_side(entities_collection, left)
 
-        if left is right and not create_aliases:
+        if left is right:
             raise sa_exc.InvalidRequestError(
                 "Can't construct a join from %s to %s, they "
                 "are the same entity" % (left, right)
@@ -373,9 +366,15 @@ def _join_left_to_right(
         # the right side as given often needs to be adapted.  additionally
         # a lot of things can be wrong with it.  handle all that and
         # get back the new effective "right" side
-        r_info, right, onclause = self._join_check_and_adapt_right_side(
-            left, right, onclause, prop, create_aliases, aliased_generation
-        )
+
+        if IS_VERSION_20:
+            r_info, right, onclause = self._join_check_and_adapt_right_side(
+                left, right, onclause, prop
+            )
+        else:
+            r_info, right, onclause = self._join_check_and_adapt_right_side(
+                left, right, onclause, prop, False, False
+            )
 
         if not r_info.is_selectable:
             extra_criteria = self._get_extra_criteria(r_info)
@@ -976,24 +975,23 @@ def visit_identity_column(self, identity, **kw):
     def get_identity_options(self, identity_options):
         text = []
         if identity_options.increment is not None:
-            text.append(f"INCREMENT BY {identity_options.increment:d}")
+            text.append("INCREMENT BY %d" % identity_options.increment)
         if identity_options.start is not None:
-            text.append(f"START WITH {identity_options.start:d}")
+            text.append("START WITH %d" % identity_options.start)
         if identity_options.minvalue is not None:
-            text.append(f"MINVALUE {identity_options.minvalue:d}")
+            text.append("MINVALUE %d" % identity_options.minvalue)
         if identity_options.maxvalue is not None:
-            text.append(f"MAXVALUE {identity_options.maxvalue:d}")
+            text.append("MAXVALUE %d" % identity_options.maxvalue)
         if identity_options.nominvalue is not None:
             text.append("NO MINVALUE")
         if identity_options.nomaxvalue is not None:
             text.append("NO MAXVALUE")
         if identity_options.cache is not None:
-            text.append(f"CACHE {identity_options.cache:d}")
+            text.append("CACHE %d" % identity_options.cache)
         if identity_options.cycle is not None:
             text.append("CYCLE" if identity_options.cycle else "NO CYCLE")
         if identity_options.order is not None:
             text.append("ORDER" if identity_options.order else "NOORDER")
-
         return " ".join(text)
 
 
@@ -1063,3 +1061,5 @@ def visit_GEOMETRY(self, type_, **kw):
 
 
 construct_arguments = [(Table, {"clusterby": None})]
+
+functions.register_function("flatten", flatten)
diff --git a/src/snowflake/sqlalchemy/compat.py b/src/snowflake/sqlalchemy/compat.py
new file mode 100644
index 00000000..659937a1
--- /dev/null
+++ b/src/snowflake/sqlalchemy/compat.py
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
+from __future__ import annotations
+
+import functools
+import warnings
+from typing import Callable
+
+from sqlalchemy import __version__ as SA_VERSION
+from sqlalchemy import util
+
+string_types = (str,)
+returns_unicode = util.symbol("RETURNS_UNICODE")
+
+IS_VERSION_20 = tuple(int(v) for v in SA_VERSION.split(".")) >= (2, 0, 0)
+
+
+def args_reducer(positions_to_drop: tuple):
+    """Removes args at positions provided in tuple positions_to_drop.
+
+    For example tuple (3, 5) will remove items at third and fifth position.
+    Keep in mind that on class methods first postion is cls or self.
+    """
+
+    def fn_wrapper(fn: Callable):
+        @functools.wraps(fn)
+        def wrapper(*args):
+            reduced_args = args
+            if not IS_VERSION_20:
+                reduced_args = tuple(
+                    arg for idx, arg in enumerate(args) if idx not in positions_to_drop
+                )
+                warnings.warn(
+                    "This needs refactoring", DeprecationWarning, stacklevel=2
+                )
+            fn(*reduced_args)
+
+        return wrapper
+
+    return fn_wrapper
+
+
+def args_filler(positions_to_insert: tuple):
+    """This method inserts into args values at positions.
+
+    positions_to_insert is a tuple of tuple containing pair of posiotion and a value.
+    ((6, False), (7, 42))
+    It will insert at position 6 value False, and at positoin 6 value 42.
+    """
+
+    def fn_wrapper(fn: Callable):
+        @functools.wraps(fn)
+        def wrapper(*args):
+            extended_args = list(args)
+            if IS_VERSION_20:
+                for idx, value in positions_to_insert:
+                    extended_args.insert(idx, value)
+                warnings.warn(
+                    "This needs refactoring", DeprecationWarning, stacklevel=2
+                )
+            fn(*extended_args)
+
+        return wrapper
+
+    return fn_wrapper
diff --git a/src/snowflake/sqlalchemy/custom_commands.py b/src/snowflake/sqlalchemy/custom_commands.py
index cec16673..15585bd5 100644
--- a/src/snowflake/sqlalchemy/custom_commands.py
+++ b/src/snowflake/sqlalchemy/custom_commands.py
@@ -10,7 +10,8 @@
 from sqlalchemy.sql.dml import UpdateBase
 from sqlalchemy.sql.elements import ClauseElement
 from sqlalchemy.sql.roles import FromClauseRole
-from sqlalchemy.util.compat import string_types
+
+from .compat import string_types
 
 NoneType = type(None)
 
diff --git a/src/snowflake/sqlalchemy/functions.py b/src/snowflake/sqlalchemy/functions.py
new file mode 100644
index 00000000..4a7ee0b0
--- /dev/null
+++ b/src/snowflake/sqlalchemy/functions.py
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
+
+import warnings
+
+from sqlalchemy.sql import functions as sqlfunc
+
+FLATTEN_WARNING = "For backward compatibility params are not rendered."
+
+
+class flatten(sqlfunc.GenericFunction):
+    name = "flatten"
+
+    def __init__(self, *args, **kwargs):
+        warnings.warn(FLATTEN_WARNING, DeprecationWarning, stacklevel=2)
+        return super().__init__(*args, **kwargs)
diff --git a/src/snowflake/sqlalchemy/requirements.py b/src/snowflake/sqlalchemy/requirements.py
index ea30a823..f2844804 100644
--- a/src/snowflake/sqlalchemy/requirements.py
+++ b/src/snowflake/sqlalchemy/requirements.py
@@ -289,9 +289,25 @@ def datetime_implicit_bound(self):
         # Check https://snowflakecomputing.atlassian.net/browse/SNOW-640134 for details on breaking changes discussion.
         return exclusions.closed()
 
+    @property
+    def date_implicit_bound(self):
+        # Supporting this would require behavior breaking change to implicitly convert str to timestamp when binding
+        # parameters in string forms of timestamp values.
+        return exclusions.closed()
+
+    @property
+    def time_implicit_bound(self):
+        # Supporting this would require behavior breaking change to implicitly convert str to timestamp when binding
+        # parameters in string forms of timestamp values.
+        return exclusions.closed()
+
     @property
     def timestamp_microseconds_implicit_bound(self):
         # Supporting this would require behavior breaking change to implicitly convert str to timestamp when binding
         # parameters in string forms of timestamp values.
         # Check https://snowflakecomputing.atlassian.net/browse/SNOW-640134 for details on breaking changes discussion.
         return exclusions.closed()
+
+    @property
+    def array_type(self):
+        return exclusions.closed()
diff --git a/src/snowflake/sqlalchemy/snowdialect.py b/src/snowflake/sqlalchemy/snowdialect.py
index 2e40d03c..a6ce7dca 100644
--- a/src/snowflake/sqlalchemy/snowdialect.py
+++ b/src/snowflake/sqlalchemy/snowdialect.py
@@ -15,7 +15,6 @@
 from sqlalchemy.schema import Table
 from sqlalchemy.sql import text
 from sqlalchemy.sql.elements import quoted_name
-from sqlalchemy.sql.sqltypes import String
 from sqlalchemy.types import (
     BIGINT,
     BINARY,
@@ -40,6 +39,7 @@
 from snowflake.connector import errors as sf_errors
 from snowflake.connector.connection import DEFAULT_CONFIGURATION
 from snowflake.connector.constants import UTF8
+from snowflake.sqlalchemy.compat import returns_unicode
 
 from .base import (
     SnowflakeCompiler,
@@ -134,7 +134,7 @@ class SnowflakeDialect(default.DefaultDialect):
     #  unicode strings
     supports_unicode_statements = True
     supports_unicode_binds = True
-    returns_unicode_strings = String.RETURNS_UNICODE
+    returns_unicode_strings = returns_unicode
     description_encoding = None
 
     # No lastrowid support. See SNOW-11155
@@ -195,6 +195,10 @@ class SnowflakeDialect(default.DefaultDialect):
 
     @classmethod
     def dbapi(cls):
+        return cls.import_dbapi()
+
+    @classmethod
+    def import_dbapi(cls):
         from snowflake import connector
 
         return connector
@@ -262,13 +266,15 @@ def create_connect_args(self, url: URL):
 
         return ([], opts)
 
-    def has_table(self, connection, table_name, schema=None):
+    @reflection.cache
+    def has_table(self, connection, table_name, schema=None, **kw):
         """
         Checks if the table exists
         """
         return self._has_object(connection, "TABLE", table_name, schema)
 
-    def has_sequence(self, connection, sequence_name, schema=None):
+    @reflection.cache
+    def has_sequence(self, connection, sequence_name, schema=None, **kw):
         """
         Checks if the sequence exists
         """
diff --git a/src/snowflake/sqlalchemy/util.py b/src/snowflake/sqlalchemy/util.py
index 32e07373..1738db3e 100644
--- a/src/snowflake/sqlalchemy/util.py
+++ b/src/snowflake/sqlalchemy/util.py
@@ -7,7 +7,7 @@
 from typing import Any
 from urllib.parse import quote_plus
 
-from sqlalchemy import exc, inspection, sql, util
+from sqlalchemy import exc, inspection, sql
 from sqlalchemy.exc import NoForeignKeysError
 from sqlalchemy.orm.interfaces import MapperProperty
 from sqlalchemy.orm.util import _ORMJoin as sa_orm_util_ORMJoin
@@ -19,6 +19,7 @@
 
 from snowflake.connector.compat import IS_STR
 from snowflake.connector.connection import SnowflakeConnection
+from snowflake.sqlalchemy import compat
 
 from ._constants import (
     APPLICATION_NAME,
@@ -212,7 +213,7 @@ def __init__(
         # then the "_joined_from_info" concept can go
         left_orm_info = getattr(left, "_joined_from_info", left_info)
         self._joined_from_info = right_info
-        if isinstance(onclause, util.string_types):
+        if isinstance(onclause, compat.string_types):
             onclause = getattr(left_orm_info.entity, onclause)
         # ####
 
diff --git a/src/snowflake/sqlalchemy/version.py b/src/snowflake/sqlalchemy/version.py
index d4318b86..55421085 100644
--- a/src/snowflake/sqlalchemy/version.py
+++ b/src/snowflake/sqlalchemy/version.py
@@ -3,4 +3,5 @@
 #
 # Update this for the versions
 # Don't change the forth version number from None
-VERSION = (1, 5, 2, None)
+# VERSION = (1, 6, 0, None)
+VERSION = "1.6.0"
diff --git a/tests/conftest.py b/tests/conftest.py
index e22e4d42..4ab9da8a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -241,7 +241,8 @@ def pytest_sessionstart(session):
     # patch the create_engine with future flag
     global create_engine_with_future_flag
     create_engine_with_future_flag = partial(
-        create_engine, future=session.config.option.run_v20_sqlalchemy
+        create_engine,
+        future=True,
     )
 
 
diff --git a/tests/sqlalchemy_test_suite/conftest.py b/tests/sqlalchemy_test_suite/conftest.py
index 31cd7c5c..f0464c7d 100644
--- a/tests/sqlalchemy_test_suite/conftest.py
+++ b/tests/sqlalchemy_test_suite/conftest.py
@@ -15,6 +15,7 @@
 
 import snowflake.connector
 from snowflake.sqlalchemy import URL
+from snowflake.sqlalchemy.compat import IS_VERSION_20
 
 from ..conftest import get_db_parameters
 from ..util import random_string
@@ -25,6 +26,12 @@
 TEST_SCHEMA_2 = f"{TEST_SCHEMA}_2"
 
 
+if IS_VERSION_20:
+    collect_ignore_glob = ["test_suite.py"]
+else:
+    collect_ignore_glob = ["test_suite_20.py"]
+
+
 # patch sqlalchemy.testing.config.Confi.__init__ for schema name randomization
 # same schema name would result in conflict as we're running tests in parallel in the CI
 def config_patched__init__(self, db, db_opts, options, file_config):
diff --git a/tests/sqlalchemy_test_suite/test_suite.py b/tests/sqlalchemy_test_suite/test_suite.py
index d79e511e..643d1559 100644
--- a/tests/sqlalchemy_test_suite/test_suite.py
+++ b/tests/sqlalchemy_test_suite/test_suite.py
@@ -69,6 +69,10 @@ def test_empty_insert(self, connection):
     def test_empty_insert_multiple(self, connection):
         pass
 
+    @pytest.mark.skip("Snowflake does not support returning in insert.")
+    def test_no_results_for_non_returning_insert(self, connection, style, executemany):
+        pass
+
 
 # 2. Patched Tests
 
diff --git a/tests/sqlalchemy_test_suite/test_suite_20.py b/tests/sqlalchemy_test_suite/test_suite_20.py
new file mode 100644
index 00000000..d4880ccc
--- /dev/null
+++ b/tests/sqlalchemy_test_suite/test_suite_20.py
@@ -0,0 +1,203 @@
+#
+# Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
+#
+import pytest
+from sqlalchemy import Integer, testing
+from sqlalchemy.schema import Column, Sequence, Table
+from sqlalchemy.testing import config
+from sqlalchemy.testing.assertions import eq_
+from sqlalchemy.testing.suite import (
+    BizarroCharacterFKResolutionTest as _BizarroCharacterFKResolutionTest,
+)
+from sqlalchemy.testing.suite import (
+    CompositeKeyReflectionTest as _CompositeKeyReflectionTest,
+)
+from sqlalchemy.testing.suite import DateTimeHistoricTest as _DateTimeHistoricTest
+from sqlalchemy.testing.suite import FetchLimitOffsetTest as _FetchLimitOffsetTest
+from sqlalchemy.testing.suite import HasSequenceTest as _HasSequenceTest
+from sqlalchemy.testing.suite import InsertBehaviorTest as _InsertBehaviorTest
+from sqlalchemy.testing.suite import LikeFunctionsTest as _LikeFunctionsTest
+from sqlalchemy.testing.suite import LongNameBlowoutTest as _LongNameBlowoutTest
+from sqlalchemy.testing.suite import SimpleUpdateDeleteTest as _SimpleUpdateDeleteTest
+from sqlalchemy.testing.suite import TimeMicrosecondsTest as _TimeMicrosecondsTest
+from sqlalchemy.testing.suite import TrueDivTest as _TrueDivTest
+from sqlalchemy.testing.suite import *  # noqa
+
+# 1. Unsupported by snowflake db
+
+del ComponentReflectionTest  # require indexes not supported by snowflake
+del HasIndexTest  # require indexes not supported by snowflake
+del QuotedNameArgumentTest  # require indexes not supported by snowflake
+
+
+class LongNameBlowoutTest(_LongNameBlowoutTest):
+    # The combination ("ix",) is removed due to Snowflake not supporting indexes
+    def ix(self, metadata, connection):
+        pytest.skip("ix required index feature not supported by Snowflake")
+
+
+class FetchLimitOffsetTest(_FetchLimitOffsetTest):
+    @pytest.mark.skip(
+        "Snowflake only takes non-negative integer constants for offset/limit"
+    )
+    def test_bound_offset(self, connection):
+        pass
+
+    @pytest.mark.skip(
+        "Snowflake only takes non-negative integer constants for offset/limit"
+    )
+    def test_simple_limit_expr_offset(self, connection):
+        pass
+
+    @pytest.mark.skip(
+        "Snowflake only takes non-negative integer constants for offset/limit"
+    )
+    def test_simple_offset(self, connection):
+        pass
+
+    @pytest.mark.skip(
+        "Snowflake only takes non-negative integer constants for offset/limit"
+    )
+    def test_simple_offset_zero(self, connection):
+        pass
+
+
+class InsertBehaviorTest(_InsertBehaviorTest):
+    @pytest.mark.skip(
+        "Snowflake does not support inserting empty values, the value may be a literal or an expression."
+    )
+    def test_empty_insert(self, connection):
+        pass
+
+    @pytest.mark.skip(
+        "Snowflake does not support inserting empty values, The value may be a literal or an expression."
+    )
+    def test_empty_insert_multiple(self, connection):
+        pass
+
+    @pytest.mark.skip("Snowflake does not support returning in insert.")
+    def test_no_results_for_non_returning_insert(self, connection, style, executemany):
+        pass
+
+
+# road to 2.0
+class TrueDivTest(_TrueDivTest):
+    @pytest.mark.skip("`//` not supported")
+    def test_floordiv_integer_bound(self, connection):
+        """Snowflake does not provide `//` arithmetic operator.
+
+        https://docs.snowflake.com/en/sql-reference/operators-arithmetic.
+        """
+        pass
+
+    @pytest.mark.skip("`//` not supported")
+    def test_floordiv_integer(self, connection, left, right, expected):
+        """Snowflake does not provide `//` arithmetic operator.
+
+        https://docs.snowflake.com/en/sql-reference/operators-arithmetic.
+        """
+        pass
+
+
+class TimeMicrosecondsTest(_TimeMicrosecondsTest):
+    ...
+
+
+class DateTimeHistoricTest(_DateTimeHistoricTest):
+    ...
+
+
+# 2. Patched Tests
+
+
+class HasSequenceTest(_HasSequenceTest):
+    # Override the define_tables method as snowflake does not support 'nomaxvalue'/'nominvalue'
+    @classmethod
+    def define_tables(cls, metadata):
+        Sequence("user_id_seq", metadata=metadata)
+        # Replace Sequence("other_seq") creation as in the original test suite,
+        # the Sequence created with 'nomaxvalue' and 'nominvalue'
+        # which snowflake does not support:
+        #     Sequence("other_seq", metadata=metadata, nomaxvalue=True, nominvalue=True)
+        Sequence("other_seq", metadata=metadata)
+        if testing.requires.schemas.enabled:
+            Sequence("user_id_seq", schema=config.test_schema, metadata=metadata)
+            Sequence("schema_seq", schema=config.test_schema, metadata=metadata)
+        Table(
+            "user_id_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+        )
+
+
+class LikeFunctionsTest(_LikeFunctionsTest):
+    @testing.requires.regexp_match
+    @testing.combinations(
+        ("a.cde.*", {1, 5, 6, 9}),
+        ("abc.*", {1, 5, 6, 9, 10}),
+        ("^abc.*", {1, 5, 6, 9, 10}),
+        (".*9cde.*", {8}),
+        ("^a.*", set(range(1, 11))),
+        (".*(b|c).*", set(range(1, 11))),
+        ("^(b|c).*", set()),
+    )
+    def test_regexp_match(self, text, expected):
+        super().test_regexp_match(text, expected)
+
+    def test_not_regexp_match(self):
+        col = self.tables.some_table.c.data
+        self._test(~col.regexp_match("a.cde.*"), {2, 3, 4, 7, 8, 10})
+
+
+class SimpleUpdateDeleteTest(_SimpleUpdateDeleteTest):
+    def test_update(self, connection):
+        t = self.tables.plain_pk
+        r = connection.execute(t.update().where(t.c.id == 2), dict(data="d2_new"))
+        assert not r.is_insert
+        # snowflake returns a row with numbers of rows updated and number of multi-joined rows updated
+        assert r.returns_rows
+        assert r.rowcount == 1
+
+        eq_(
+            connection.execute(t.select().order_by(t.c.id)).fetchall(),
+            [(1, "d1"), (2, "d2_new"), (3, "d3")],
+        )
+
+    def test_delete(self, connection):
+        t = self.tables.plain_pk
+        r = connection.execute(t.delete().where(t.c.id == 2))
+        assert not r.is_insert
+        # snowflake returns a row with number of rows deleted
+        assert r.returns_rows
+        assert r.rowcount == 1
+        eq_(
+            connection.execute(t.select().order_by(t.c.id)).fetchall(),
+            [(1, "d1"), (3, "d3")],
+        )
+
+
+class CompositeKeyReflectionTest(_CompositeKeyReflectionTest):
+    @pytest.mark.xfail(reason="Fixing this would require behavior breaking change.")
+    def test_fk_column_order(self):
+        # Check https://snowflakecomputing.atlassian.net/browse/SNOW-640134 for details on breaking changes discussion.
+        super().test_fk_column_order()
+
+    @pytest.mark.xfail(reason="Fixing this would require behavior breaking change.")
+    def test_pk_column_order(self):
+        # Check https://snowflakecomputing.atlassian.net/browse/SNOW-640134 for details on breaking changes discussion.
+        super().test_pk_column_order()
+
+
+class BizarroCharacterFKResolutionTest(_BizarroCharacterFKResolutionTest):
+    @testing.combinations(
+        ("id",), ("(3)",), ("col%p",), ("[brack]",), argnames="columnname"
+    )
+    @testing.variation("use_composite", [True, False])
+    @testing.combinations(
+        ("plain",),
+        ("(2)",),
+        ("[brackets]",),
+        argnames="tablename",
+    )
+    def test_fk_ref(self, connection, metadata, use_composite, tablename, columnname):
+        super().test_fk_ref(connection, metadata, use_composite, tablename, columnname)
diff --git a/tests/test_compiler.py b/tests/test_compiler.py
index 0fd75c38..40207b41 100644
--- a/tests/test_compiler.py
+++ b/tests/test_compiler.py
@@ -5,7 +5,7 @@
 from sqlalchemy import Integer, String, and_, func, select
 from sqlalchemy.schema import DropColumnComment, DropTableComment
 from sqlalchemy.sql import column, quoted_name, table
-from sqlalchemy.testing import AssertsCompiledSQL
+from sqlalchemy.testing.assertions import AssertsCompiledSQL
 
 from snowflake.sqlalchemy import snowdialect
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 60b4fea4..37f29832 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -35,7 +35,7 @@
 )
 from sqlalchemy.exc import DBAPIError, NoSuchTableError
 from sqlalchemy.pool import NullPool
-from sqlalchemy.sql import and_, not_, or_, select
+from sqlalchemy.sql import and_, insert, not_, or_, select
 
 import snowflake.connector.errors
 import snowflake.sqlalchemy.snowdialect
@@ -407,16 +407,6 @@ def test_insert_tables(engine_testaccount):
                     str(users.join(addresses)) == "users JOIN addresses ON "
                     "users.id = addresses.user_id"
                 )
-                assert (
-                    str(
-                        users.join(
-                            addresses,
-                            addresses.c.email_address.like(users.c.name + "%"),
-                        )
-                    )
-                    == "users JOIN addresses "
-                    "ON addresses.email_address LIKE users.name || :name_1"
-                )
 
                 s = select(users.c.fullname).select_from(
                     users.join(
@@ -445,7 +435,7 @@ def test_table_does_not_exist(engine_testaccount):
     """
     meta = MetaData()
     with pytest.raises(NoSuchTableError):
-        Table("does_not_exist", meta, autoload=True, autoload_with=engine_testaccount)
+        Table("does_not_exist", meta, autoload_with=engine_testaccount)
 
 
 @pytest.mark.skip(
@@ -471,9 +461,7 @@ def test_reflextion(engine_testaccount):
         )
         try:
             meta = MetaData()
-            user_reflected = Table(
-                "user", meta, autoload=True, autoload_with=engine_testaccount
-            )
+            user_reflected = Table("user", meta, autoload_with=engine_testaccount)
             assert user_reflected.c == ["user.id", "user.name", "user.fullname"]
         finally:
             conn.execute("DROP TABLE IF EXISTS user")
@@ -1438,6 +1426,9 @@ def test_autoincrement(engine_testaccount):
         Column("name", String(39)),
     )
 
+    insert_stmt = insert(users)
+    select_stmt = select(users.c.name).order_by("uid")
+
     try:
         metadata.create_all(engine_testaccount)
 
@@ -1564,11 +1555,16 @@ def test_too_many_columns_detection(engine_testaccount, db_parameters):
     metadata.create_all(engine_testaccount)
     inspector = inspect(engine_testaccount)
     # Do test
-    original_execute = inspector.bind.execute
+    connection = inspector.bind.connect()
+    original_execute = connection.execute
+
+    too_many_columns_was_raised = False
 
     def mock_helper(command, *args, **kwargs):
-        if "_get_schema_columns" in command:
+        if "_get_schema_columns" in command.text:
             # Creating exception exactly how SQLAlchemy does
+            nonlocal too_many_columns_was_raised
+            too_many_columns_was_raised = True
             raise DBAPIError.instance(
                 """
             SELECT /* sqlalchemy:_get_schema_columns */
@@ -1600,9 +1596,12 @@ def mock_helper(command, *args, **kwargs):
         else:
             return original_execute(command, *args, **kwargs)
 
-    with patch.object(inspector.bind, "execute", side_effect=mock_helper):
-        column_metadata = inspector.get_columns("users", db_parameters["schema"])
+    with patch.object(engine_testaccount, "connect") as conn:
+        conn.return_value = connection
+        with patch.object(connection, "execute", side_effect=mock_helper):
+            column_metadata = inspector.get_columns("users", db_parameters["schema"])
     assert len(column_metadata) == 4
+    assert too_many_columns_was_raised
     # Clean up
     metadata.drop_all(engine_testaccount)
 
@@ -1644,9 +1643,7 @@ def test_column_type_schema(engine_testaccount):
 """
         )
 
-        table_reflected = Table(
-            table_name, MetaData(), autoload=True, autoload_with=conn
-        )
+        table_reflected = Table(table_name, MetaData(), autoload_with=conn)
         columns = table_reflected.columns
         assert (
             len(columns) == len(ischema_names_baseline) - 1
@@ -1667,9 +1664,7 @@ def test_result_type_and_value(engine_testaccount):
 )
 """
         )
-        table_reflected = Table(
-            table_name, MetaData(), autoload=True, autoload_with=conn
-        )
+        table_reflected = Table(table_name, MetaData(), autoload_with=conn)
         current_date = date.today()
         current_utctime = datetime.utcnow()
         current_localtime = pytz.utc.localize(current_utctime, is_dst=False).astimezone(
diff --git a/tests/test_custom_functions.py b/tests/test_custom_functions.py
new file mode 100644
index 00000000..2a1e1cb5
--- /dev/null
+++ b/tests/test_custom_functions.py
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
+
+import pytest
+from sqlalchemy import func
+
+from snowflake.sqlalchemy import snowdialect
+
+
+def test_flatten_does_not_render_params():
+    """This behavior is for backward compatibility.
+
+    In previous version params were not rendered.
+    In future this behavior will change.
+    """
+    flat = func.flatten("[1, 2]", outer=True)
+    res = flat.compile(dialect=snowdialect.dialect())
+
+    assert str(res) == "flatten(%(flatten_1)s)"
+
+
+def test_flatten_emits_warning():
+    expected_warning = "For backward compatibility params are not rendered."
+    with pytest.warns(DeprecationWarning, match=expected_warning):
+        func.flatten().compile(dialect=snowdialect.dialect())
diff --git a/tests/test_orm.py b/tests/test_orm.py
index e485d737..c540ad58 100644
--- a/tests/test_orm.py
+++ b/tests/test_orm.py
@@ -367,18 +367,29 @@ class Department(Base):
         .select_from(Employee)
         .outerjoin(sub)
     )
-    assert (
-        str(query.compile(engine_testaccount)).replace("\n", "")
-        == "SELECT employees.employee_id, departments.department_id "
+    compiled_stmts = (
+        # v1.x
+        "SELECT employees.employee_id, departments.department_id "
         "FROM departments, employees LEFT OUTER JOIN LATERAL "
         "(SELECT departments.department_id AS department_id, departments.name AS name "
-        "FROM departments) AS anon_1"
+        "FROM departments) AS anon_1",
+        # v2.x
+        "SELECT employees.employee_id, departments.department_id "
+        "FROM employees LEFT OUTER JOIN LATERAL "
+        "(SELECT departments.department_id AS department_id, departments.name AS name "
+        "FROM departments) AS anon_1, departments",
     )
+    compiled_stmt = str(query.compile(engine_testaccount)).replace("\n", "")
+    assert compiled_stmt in compiled_stmts
+
     with caplog.at_level(logging.DEBUG):
         assert [res for res in session.execute(query)]
     assert (
         "SELECT employees.employee_id, departments.department_id FROM departments"
         in caplog.text
+    ) or (
+        "SELECT employees.employee_id, departments.department_id FROM employees"
+        in caplog.text
     )
 
 
diff --git a/tox.ini b/tox.ini
index 0c1cb483..64786f53 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 min_version = 4.0.0
 envlist = fix_lint,
           py{37,38,39,310,311}{,-pandas},
+          py{38}-sqlalchemy-v2,
           coverage,
 skip_missing_interpreters = true
 
@@ -34,7 +35,7 @@ passenv =
 setenv =
     COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}}
     SQLALCHEMY_WARN_20 = 1
-    ci: SNOWFLAKE_PYTEST_OPTS = -vvv
+    ci: SNOWFLAKE_PYTEST_OPTS = -vvv --tb=long
 commands = pytest \
            {env:SNOWFLAKE_PYTEST_OPTS:} \
            --cov "snowflake.sqlalchemy" \
@@ -85,8 +86,29 @@ skip_install = True
 commands = pre-commit run --all-files
            python -c 'import pathlib; print("hint: run \{\} install to add checks as pre-commit hook".format(pathlib.Path(r"{envdir}") / "bin" / "pre-commit"))'
 
+[testenv:py{38}-sqlalchemy-v2]
+base_python = py38
+commands =
+  pip install -U sqlalchemy
+  pip list
+  pytest \
+    {env:SNOWFLAKE_PYTEST_OPTS:} \
+    --cov "snowflake.sqlalchemy" \
+    --junitxml {toxworkdir}/junit_{envname}.xml \
+    {posargs:tests}
+    pytest {env:SNOWFLAKE_PYTEST_OPTS:} \
+    --cov "snowflake.sqlalchemy" --cov-append \
+    --junitxml {toxworkdir}/junit_{envname}.xml \
+    {posargs:tests/sqlalchemy_test_suite}
+    pytest \
+    {env:SNOWFLAKE_PYTEST_OPTS:} \
+    --cov "snowflake.sqlalchemy" --cov-append \
+    --junitxml {toxworkdir}/junit_{envname}.xml \
+    --run_v20_sqlalchemy \
+    {posargs:tests}
+
 [pytest]
-addopts = -ra --strict-markers --ignore=tests/sqlalchemy_test_suite
+addopts = -ra --ignore=tests/sqlalchemy_test_suite
 junit_family = legacy
 log_level = info
 markers =