diff --git a/.github/workflows/rails.yml b/.github/workflows/rails.yml
index 9dc673638..beba4f26b 100644
--- a/.github/workflows/rails.yml
+++ b/.github/workflows/rails.yml
@@ -23,6 +23,17 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '8' # TODO version should not be specified
+
+    - name: Install Ember-Cli with NPM
+      run: npm install -g ember-cli@3.15.2  # TODO version should not be specified
+      working-directory: frontend
+
+    - name: Install dependencies Yarn
+      run: yarn install --frozen-lockfile
+      working-directory: frontend
 
     - name: Setup test database
       env:
@@ -45,3 +56,6 @@ jobs:
 
     - name: Run RuboCop
       run: bundle exec rubocop --parallel
+
+    - name: Run Frontend Tests
+      run: bundle exec rake spec:frontend
\ No newline at end of file
diff --git a/bin/frontend-tests.sh b/bin/frontend-tests.sh
index 000e06ac3..c2b5dcba1 100755
--- a/bin/frontend-tests.sh
+++ b/bin/frontend-tests.sh
@@ -13,7 +13,6 @@ esac
 
 rails server -e test -d -p $RAILS_PORT -P $PID_FILE
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
 cd frontend
 if [[ $SERVER == true ]]; then
   ember test --server
@@ -22,7 +21,6 @@ else
 fi
 rc=$?
 cd ..
-
 kill -INT $(cat $PID_FILE)
 
 exit $rc