diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index ef2cae2f7..7456ea9e5 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -105,7 +105,7 @@ jobs:
       run: >-
         python -m tests -n=4
         --cov-report=xml --cov-report=term
-        --all ${{ env.extra_test_args }}
+        ${{ env.extra_test_args }}
     - name: upload coverage report
       uses: codecov/codecov-action@v2.1.0
       with:
diff --git a/dvc/machine/backend/terraform.py b/dvc/machine/backend/terraform.py
index 118fb3512..ce836cdd5 100644
--- a/dvc/machine/backend/terraform.py
+++ b/dvc/machine/backend/terraform.py
@@ -25,7 +25,7 @@ class TerraformBackend(terraform.TerraformBackend, BaseMachineBackend):
     def get_sshfs(  # pylint: disable=unused-argument
         self, name: Optional[str] = None, **config
     ) -> Iterator["SSHFileSystem"]:
-        resource = self._default_resource(name)
+        resource = self.default_resource(name)
         with TerraformProviderIterative.pemfile(resource) as pem:
             fs = SSHFileSystem(
                 host=resource["instance_ip"],
diff --git a/setup.cfg b/setup.cfg
index ee4b40709..e48ba60cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -113,7 +113,7 @@ ssh_gssapi = sshfs[gssapi]>=2021.8.1
 webdav = webdav4>=0.9.1
 # not to break `dvc[webhdfs]`
 webhdfs =
-terraform = tpi[ssh]>=0.0.0
+terraform = tpi[ssh]>=2.0.0
 tests =
     %(terraform)s
     wheel==0.37.0
diff --git a/tests/remotes/s3.py b/tests/remotes/s3.py
index d3fc9ab88..43de2a0c0 100644
--- a/tests/remotes/s3.py
+++ b/tests/remotes/s3.py
@@ -147,15 +147,15 @@ def s3_server(test_config, docker_compose, docker_services):
 
 
 @pytest.fixture
-def s3(s3_server, s3_fake_creds_file):
+def s3(test_config, s3_server, s3_fake_creds_file):
+    test_config.requires("s3")
     workspace = S3(S3.get_url())
     workspace._s3.create_bucket(Bucket=TEST_AWS_REPO_BUCKET)
     yield workspace
 
 
 @pytest.fixture
-def real_s3(test_config):
-    test_config.requires("s3")
+def real_s3():
     if not S3.should_test():
         pytest.skip("no real s3")
     yield S3(S3.get_url())