diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index 32aa279c67..ba0a3fb24f 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -9,7 +9,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
@@ -138,16 +137,6 @@ func setupTestHelper(enterprise bool, updateConfig func(*model.Config)) *TestHel
 		th.tempWorkspace = dir
 	}
 
-	pluginDir := filepath.Join(th.tempWorkspace, "plugins")
-	webappDir := filepath.Join(th.tempWorkspace, "webapp")
-
-	th.App.UpdateConfig(func(cfg *model.Config) {
-		*cfg.PluginSettings.Directory = pluginDir
-		*cfg.PluginSettings.ClientDirectory = webappDir
-	})
-
-	th.App.InitPlugins(pluginDir, webappDir)
-
 	return th
 }
 
diff --git a/testlib/resources.go b/testlib/resources.go
index 6a253217f6..8f058df58d 100644
--- a/testlib/resources.go
+++ b/testlib/resources.go
@@ -111,6 +111,12 @@ func SetupTestResources() (string, error) {
 		return "", errors.Wrapf(err, "failed to create plugins directory %s", pluginsDir)
 	}
 
+	clientDir := path.Join(tempDir, "client")
+	err = os.Mkdir(clientDir, 0700)
+	if err != nil {
+		return "", errors.Wrapf(err, "failed to create client directory %s", clientDir)
+	}
+
 	err = setupConfig(path.Join(tempDir, "config"))
 	if err != nil {
 		return "", errors.Wrap(err, "failed to setup config")
@@ -168,10 +174,10 @@ func setupConfig(configDir string) error {
 		return errors.Wrapf(err, "failed to create config directory %s", configDir)
 	}
 
-	configJson := path.Join(configDir, "config.json")
-	err = ioutil.WriteFile(configJson, []byte(config.ToJson()), 0644)
+	configJSON := path.Join(configDir, "config.json")
+	err = ioutil.WriteFile(configJSON, []byte(config.ToJson()), 0644)
 	if err != nil {
-		return errors.Wrapf(err, "failed to write config to %s", configJson)
+		return errors.Wrapf(err, "failed to write config to %s", configJSON)
 	}
 
 	return nil