diff --git a/webapp/package.json b/webapp/package.json
index f0400cce0..d676ba010 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -45,11 +45,12 @@
     "moduleNameMapper": {
       "^@/(.*)$": "<rootDir>/src/$1",
       "^~/(.*)$": "<rootDir>/$1",
-      "\\.(css|less)$": "identity-obj-proxy"
+      "\\.(css|less)$": "identity-obj-proxy",
+      "\\.(svg)$": "<rootDir>/test/fileMock.js"
     },
     "setupFiles": [
-      "<rootDir>/registerContext.js",
-      "<rootDir>/testSetup.js"
+      "<rootDir>/test/registerContext.js",
+      "<rootDir>/test/testSetup.js"
     ],
     "testMatch": [
       "**/?(*.)+(spec|test).js?(x)"
diff --git a/webapp/test/fileMock.js b/webapp/test/fileMock.js
new file mode 100644
index 000000000..0e56c5b5f
--- /dev/null
+++ b/webapp/test/fileMock.js
@@ -0,0 +1 @@
+module.exports = 'test-file-stub'
diff --git a/webapp/registerContext.js b/webapp/test/registerContext.js
similarity index 100%
rename from webapp/registerContext.js
rename to webapp/test/registerContext.js
diff --git a/webapp/testSetup.js b/webapp/test/testSetup.js
similarity index 100%
rename from webapp/testSetup.js
rename to webapp/test/testSetup.js