diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67862282a..c1112636a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,12 +72,12 @@ jobs:
     - name: Backtesting
       run: |
         cp config.json.example config.json
-        freqtrade --datadir tests/testdata backtesting
+        freqtrade backtesting --datadir tests/testdata --strategy DefaultStrategy
 
     - name: Hyperopt
       run: |
         cp config.json.example config.json
-        freqtrade --datadir tests/testdata --strategy SampleStrategy hyperopt --customhyperopt SampleHyperOpts -e 5
+        freqtrade hyperopt --datadir tests/testdata -e 5 --strategy SampleStrategy --hyperopt SampleHyperOpts
 
     - name: Flake8
       run: |
@@ -137,12 +137,12 @@ jobs:
     - name: Backtesting
       run: |
         cp config.json.example config.json
-        freqtrade --datadir tests/testdata backtesting
+        freqtrade backtesting --datadir tests/testdata --strategy DefaultStrategy
 
     - name: Hyperopt
       run: |
         cp config.json.example config.json
-        freqtrade --datadir tests/testdata --strategy SampleStrategy hyperopt --customhyperopt SampleHyperOpts -e 5
+        freqtrade hyperopt --datadir tests/testdata -e 5 --strategy SampleStrategy --customhyperopt SampleHyperOpts
 
     - name: Flake8
       run: |
diff --git a/Dockerfile.pi b/Dockerfile.pi
index 85ba5892f..279f85a04 100644
--- a/Dockerfile.pi
+++ b/Dockerfile.pi
@@ -38,3 +38,4 @@ RUN ~/berryconda3/bin/pip install -e . --no-cache-dir
 RUN [ "cross-build-end" ]
 
 ENTRYPOINT ["/root/berryconda3/bin/python","./freqtrade/main.py"]
+CMD [ "trade" ]