diff --git a/bin/run_integration_tests b/bin/run_integration_tests
deleted file mode 100755
index 82b7ca4a4c..0000000000
--- a/bin/run_integration_tests
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 Intel Corporation
-# Copyright 2019 Cargill Incorporated
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------------
-
-top_dir=$(cd $(dirname $(dirname $0)) && pwd)
-exitcode=0
-
-cd $top_dir/daemon/test
-
-CARGO_ARGS=" --features experimental" docker-compose up --abort-on-container-exit --exit-code-from daemon
-test_exit=$?
-
-if [[ $test_exit != 0 ]]; then
-    exitcode=1
-fi
-
-function clean_up {
-    docker-compose  down
-}
-
-clean_up
-
-cd $top_dir/integration
-
-CARGO_ARGS=" --features experimental" docker-compose up --abort-on-container-exit --exit-code-from gridd
-test_exit=$?
-
-if [[ $test_exit != 0 ]]; then
-    exitcode=1
-fi
-
-function clean_up {
-    docker-compose  down
-}
-
-trap clean_up EXIT
-
-exit $exitcode
diff --git a/justfile b/justfile
index 80d54d0c12..a3aada1129 100644
--- a/justfile
+++ b/justfile
@@ -61,6 +61,7 @@ ci:
     just ci-test-ui
     just ci-lint
     just ci-test
+    ci-test-integration
 
 ci-build-ui-test-deps:
     #!/usr/bin/env sh
@@ -87,6 +88,22 @@ ci-test:
     docker-compose -f docker/compose/grid-tests.yaml build --force-rm
     docker-compose -f docker/compose/grid-tests.yaml up --abort-on-container-exit --exit-code-from grid_tests
 
+ci-test-integration:
+    #!/usr/bin/env sh
+    set -e
+    echo "\033[1mRunning daemon integration test\033[0m"
+    cd daemon/test && \
+      CARGO_ARGS=" --features experimental" \
+      docker-compose up \
+        --abort-on-container-exit \
+        --exit-code-from daemon --build
+    echo "\033[1mRunning integration test\033[0m"
+    cd ../../integration && \
+      CARGO_ARGS=" --features experimental" \
+      docker-compose up \
+        --abort-on-container-exit \
+        --exit-code-from gridd --build
+
 ci-test-ui: ci-build-ui-test-deps
     #!/usr/bin/env sh
     set -e