diff --git a/buildstream/element.py b/buildstream/element.py
index aff185405eb7c2e3856f56ca2819d73826b9c90b..5fd635232afa881012cceac9450d3c465ed7f3bb 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -1682,8 +1682,8 @@ class Element(Plugin):
                             "unable to collect artifact contents"
                             .format(collect))
 
-            # Finally cleanup the build dir
-            cleanup_rootdir()
+                    # Finally cleanup the build dir
+                    cleanup_rootdir()
 
         return artifact_size
 
diff --git a/tests/integration/shell.py b/tests/integration/shell.py
index 947650ff1f8644b5f42206064ed687a31d146e38..cd3c1a977985fe85755ef49877ff749b62142d79 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -302,48 +302,6 @@ def test_workspace_visible(cli, tmpdir, datafiles):
     assert result.output == workspace_hello
 
 
-# Test that we can see the workspace files in a shell
-@pytest.mark.integration
-@pytest.mark.datafiles(DATA_DIR)
-def test_sysroot_workspace_visible(cli, tmpdir, datafiles):
-    project = os.path.join(datafiles.dirname, datafiles.basename)
-    workspace = os.path.join(cli.directory, 'workspace')
-    element_name = 'workspace/workspace-mount-fail.bst'
-
-    # Open a workspace on our build failing element
-    #
-    res = cli.run(project=project, args=['workspace', 'open', element_name, workspace])
-    assert res.exit_code == 0
-
-    # Ensure the dependencies of our build failing element are built
-    result = cli.run(project=project, args=['build', element_name])
-    result.assert_main_error(ErrorDomain.STREAM, None)
-
-    # Discover the sysroot of the failed build directory, after one
-    # failed build, there should be only one directory there.
-    #
-    build_base = os.path.join(cli.directory, 'build')
-    build_dirs = os.listdir(path=build_base)
-    assert len(build_dirs) == 1
-    build_dir = os.path.join(build_base, build_dirs[0])
-
-    # Obtain a copy of the hello.c content from the workspace
-    #
-    workspace_hello_path = os.path.join(cli.directory, 'workspace', 'hello.c')
-    assert os.path.exists(workspace_hello_path)
-    with open(workspace_hello_path, 'r') as f:
-        workspace_hello = f.read()
-
-    # Cat the hello.c file from a bst shell command, and assert
-    # that we got the same content here
-    #
-    result = cli.run(project=project, args=[
-        'shell', '--build', '--sysroot', build_dir, element_name, '--', 'cat', 'hello.c'
-    ])
-    assert result.exit_code == 0
-    assert result.output == workspace_hello
-
-
 # Test system integration commands can access devices in /dev
 @pytest.mark.datafiles(DATA_DIR)
 def test_integration_devices(cli, tmpdir, datafiles):