diff --git a/.github/workflows/integration_testing.yml b/.github/workflows/integration_testing.yml
index a162b06..ba2e300 100644
--- a/.github/workflows/integration_testing.yml
+++ b/.github/workflows/integration_testing.yml
@@ -19,23 +19,5 @@ jobs:
     with:
       submodules: false
       envs: |
-        - linux: py311-asdf_astropy
-        - linux: py311-asdf_astropy-dev
-        - linux: py311-astropy_healpix
-        - linux: py311-astropy_healpix-dev
         - linux: py311-astroquery
         - linux: py311-astroquery-dev
-        - linux: py311-ccdproc
-        - linux: py311-ccdproc-dev
-        - linux: py311-photutils
-        - linux: py311-photutils-dev
-        - linux: py311-regions
-        - linux: py311-regions-dev
-        - linux: py311-reproject
-        - linux: py311-reproject-dev
-        - linux: py311-specreduce
-        - linux: py311-specreduce-dev
-        - linux: py311-specutils
-        - linux: py311-specutils-dev
-        - linux: py311-sunpy
-        - linux: py311-sunpy-dev
diff --git a/astroquery_pytest.ini b/astroquery_pytest.ini
new file mode 100644
index 0000000..4f85c8a
--- /dev/null
+++ b/astroquery_pytest.ini
@@ -0,0 +1,60 @@
+# This is copied from setup.cfg in astroquery
+[pytest]
+minversion = 6.0
+norecursedirs = build docs/_build astroquery/irsa astroquery/nasa_exoplanet_archive astroquery/ned astroquery/ibe astroquery/irsa_dust astroquery/cds astroquery/sha astroquery/dace
+testpaths = astroquery docs
+doctest_plus = enabled
+astropy_header = true
+text_file_format = rst
+xfail_strict = true
+remote_data_strict = true
+addopts = --color=yes --doctest-rst --doctest-continue-on-failure
+filterwarnings =
+    error
+# Remove along with astropy-helpers, once we switch to a new versioning scheme
+    ignore:Use setlocale:DeprecationWarning
+    ignore: 'locale.getdefaultlocale' is deprecated and slated for removal:DeprecationWarning
+#   These are temporary measures, all of these should be fixed:
+#   -----------------------------------------------------------
+    ignore:distutils Version classes are deprecated:DeprecationWarning
+# Upstream issues in many packages, not clear whether we can do anything about these in astroquery
+    ignore:unclosed <socket.socket:ResourceWarning
+    ignore:unclosed <ssl.SSLSocket:ResourceWarning
+# Various VO warnings from vo_conesearch
+    ignore::astropy.io.votable.exceptions.W21
+    ignore::astropy.io.votable.exceptions.W42
+# utils.commons.FileContainer needs a refactor
+    ignore:FITS files must be read as binaries:astroquery.exceptions.InputWarning
+# utils.commons.parse_coordinates, we should remove its usage:
+    ignore:Coordinate string is being interpreted as an ICRS coordinate:astroquery.exceptions.InputWarning
+    ignore:Coordinate string is being interpreted as an ICRS coordinate:UserWarning
+# To be removed with a fix for https://github.com/astropy/astroquery/issues/2242
+    ignore::astropy.io.votable.exceptions.E02
+# Warnings from yet to be refactored or to be removed modules
+    ignore:Experimental. ALFALFA:UserWarning
+    ignore:Experimental. Fermi-LAT:UserWarning
+    ignore:Experimental. SHA:UserWarning
+    ignore:Experimental. OGLE:UserWarning:
+# Warnings from deprecated or known-to-be-broken modules. They have to be listed to make test collection work,
+# Can be removed once the modules are removed.
+    ignore:vamdclib could not be imported; the vamdc astroquery module will not work:UserWarning
+    ignore:the vamdc astroquery module:astropy.utils.exceptions.AstropyDeprecationWarning
+    # exoplanet_orbit_database
+    ignore:due to the retirement of its upstream website:astropy.utils.exceptions.AstropyDeprecationWarning
+# Leap second update related warning
+    ignore:leap-second auto-update failed:astropy.utils.exceptions.AstropyWarning
+# Should ignore these for astropy<5.0
+    ignore:getName|currentThread:DeprecationWarning:astropy
+# Numpy 2.0 deprecations triggered by upstream libraries.
+# Exact warning messages differ, thus using a super generic filter.
+    ignore:numpy.core:DeprecationWarning
+# SHA module deprecation/defunct
+    ignore:The upstream SHA API has been changed:UserWarning
+# CDMS triggers this, but we don't use it directly
+    ignore: The 'strip_cdata' option of HTMLParser:DeprecationWarning
+# Triggered in mast, likely boto related
+    ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning
+
+markers =
+    bigdata: marks tests that are expected to trigger a large download (deselect with '-m "not bigdata"')
+    noautofixt: disabling fixture autouse
diff --git a/tox.ini b/tox.ini
index f21f99e..5c6f04a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,7 @@ deps =
     astropy_healpix-dev,all-dev: astropy_healpix[test] @ git+https://github.com/astropy/astropy-healpix.git
 
     astroquery-!dev,all-!dev: astroquery[test,all]
-    astroquery-dev,all-dev: astroquery[test,all] @ git+https://github.com/astropy/astroquery.git
+    astroquery-dev,all-dev: astroquery[test,all] @ git+https://github.com/pllim/astroquery.git@mv-conftest
 
     ccdproc,all: psutil
     ccdproc-!dev,all-!dev: ccdproc[test,all]
@@ -66,7 +66,7 @@ commands =
     pip freeze
     asdf_astropy,all: pytest --pyargs asdf_astropy
     astropy_healpix,all: pytest --pyargs astropy_healpix
-    astroquery,all: pytest --pyargs astroquery -k "not test_deprecated_namespace_import_warning and not test_raises_deprecation_warning"
+    astroquery,all: pytest --pyargs astroquery -c astroquery_pytest.ini
     ccdproc,all: pytest --pyargs ccdproc
     photutils,all: pytest --pyargs photutils
     regions,all: pytest --pyargs regions