diff --git a/tests/optimize/test_backtesting.py b/tests/optimize/test_backtesting.py
index b722dd3f8..e74ead33d 100644
--- a/tests/optimize/test_backtesting.py
+++ b/tests/optimize/test_backtesting.py
@@ -869,6 +869,7 @@ def test_backtest_start_multi_strat(default_conf, mocker, caplog, testdatadir):
         'backtesting',
         '--config', 'config.json',
         '--datadir', str(testdatadir),
+        '--strategy-path', str(Path(__file__).parents[2] / 'freqtrade/templates'),
         '--ticker-interval', '1m',
         '--timerange', '1510694220-1510700340',
         '--enable-position-stacking',
diff --git a/tests/strategy/test_strategy.py b/tests/strategy/test_strategy.py
index 97affc99c..2b84bc6ee 100644
--- a/tests/strategy/test_strategy.py
+++ b/tests/strategy/test_strategy.py
@@ -36,13 +36,15 @@ def test_search_strategy():
 
 
 def test_load_strategy(default_conf, result):
-    default_conf.update({'strategy': 'SampleStrategy'})
+    default_conf.update({'strategy': 'SampleStrategy',
+                         'strategy_path': str(Path(__file__).parents[2] / 'freqtrade/templates')
+                         })
     resolver = StrategyResolver(default_conf)
     assert 'rsi' in resolver.strategy.advise_indicators(result, {'pair': 'ETH/BTC'})
 
 
 def test_load_strategy_base64(result, caplog, default_conf):
-    with open("user_data/strategies/sample_strategy.py", "rb") as file:
+    with (Path(__file__).parents[2] / 'freqtrade/templates/sample_strategy.py').open("rb") as file:
         encoded_string = urlsafe_b64encode(file.read()).decode("utf-8")
     default_conf.update({'strategy': 'SampleStrategy:{}'.format(encoded_string)})
 
@@ -57,7 +59,7 @@ def test_load_strategy_invalid_directory(result, caplog, default_conf):
     default_conf['strategy'] = 'SampleStrategy'
     resolver = StrategyResolver(default_conf)
     extra_dir = Path.cwd() / 'some/path'
-    resolver._load_strategy('SampleStrategy', config=default_conf, extra_dir=extra_dir)
+    resolver._load_strategy('DefaultStrategy', config=default_conf, extra_dir=extra_dir)
 
     assert log_has_re(r'Path .*' + r'some.*path.*' + r'.* does not exist', caplog)
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index bbb4fc648..88c9af35d 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -442,6 +442,7 @@ def test_create_datadir_failed(caplog):
 
 def test_create_datadir(caplog, mocker):
     cud = mocker.patch("freqtrade.utils.create_userdata_dir", MagicMock())
+    csf = mocker.patch("freqtrade.utils.copy_sample_files", MagicMock())
     args = [
         "create-userdir",
         "--userdir",
@@ -450,6 +451,7 @@ def test_create_datadir(caplog, mocker):
     start_create_userdir(get_args(args))
 
     assert cud.call_count == 1
+    assert csf.call_count == 1
     assert len(caplog.record_tuples) == 0
 
 
diff --git a/user_data/hyperopts/.gitkeep b/user_data/hyperopts/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/user_data/strategies/.gitkeep b/user_data/strategies/.gitkeep
new file mode 100644
index 000000000..e69de29bb