diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml
index 8b390705..02d018ba 100644
--- a/.github/workflows/industrial_ci_action.yml
+++ b/.github/workflows/industrial_ci_action.yml
@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 30
     env:
       ADDITIONAL_DEBS: apt-utils git-core openssh-client openssh-server curl
-      AFTER_INIT: mkdir -p ~/.ssh && touch ~/.ssh/known_hosts && ssh-keyscan github.com >> ~/.ssh/known_hosts && git config --global url."https://token:${{secrets.GITHUBPAT}}@github.com/".insteadOf "https://github.com/" && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && apt-get install git-lfs -y && cd $HOME && git lfs install && cd -
+      AFTER_INIT: mkdir -p ~/.ssh && touch ~/.ssh/known_hosts && ssh-keyscan github.com >> ~/.ssh/known_hosts && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && apt-get install git-lfs -y && cd $HOME && git lfs install && cd -
       CATKIN_LINT: pedantic
       NOT_TEST_DOWNSTREAM: true
       PYLINT_ARGS: "--output-format=parseable --errors-only --ignored-modules=catkin_pkg.python_setup,lxml.etree,lxml.builder,matplotlib,numpy,progressbar,rospkg,six.moves.http_client,tf2_ros,yaml"
@@ -27,7 +27,7 @@ jobs:
         env:
           - {ROS_DISTRO: kinetic}
           - {ROS_DISTRO: melodic}
-          - {ROS_DISTRO: noetic, BEFORE_RUN_TARGET_TEST: apt install -y python3-osrf-pycommon} # manual installation of osrf-pycomm is a workaround for https://github.com/catkin/catkin_tools/issues/594#issuecomment-688149976
+          - {ROS_DISTRO: noetic, BEFORE_BUILD_TARGET_WORKSPACE: apt install -y python3-osrf-pycommon} # manual installation of osrf-pycomm is a workaround for https://github.com/catkin/catkin_tools/issues/594#issuecomment-688149976
     name: ${{matrix.env.ROS_DISTRO}}
     runs-on: ubuntu-latest
     steps:
diff --git a/atf_test/CMakeLists.txt b/atf_test/CMakeLists.txt
index f5351328..f8b8082c 100644
--- a/atf_test/CMakeLists.txt
+++ b/atf_test/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(atf_test)
 
-find_package(catkin REQUIRED)
+find_package(catkin REQUIRED COMPONENTS rostest)
 
 catkin_package()
 
@@ -22,13 +22,13 @@ install(DIRECTORY atf launch test
 #############
 ## Testing ##
 #############
-#if(CATKIN_ENABLE_TESTING)
-#  find_package(rostest REQUIRED)
-#  add_rostest(test/manual_execution.test)
-#endif()
-
 if(CATKIN_ENABLE_TESTING)
   find_package(atf_core REQUIRED)
-  atf_test(atf/test_generation_config.yaml)
-  atf_test(atf/test_generation_config_extended.yaml False)
+  add_rostest(test/manual_execution.test)
 endif()
+
+#if(CATKIN_ENABLE_TESTING)
+#  find_package(atf_core REQUIRED)
+#  atf_test(atf/test_generation_config.yaml)
+#  atf_test(atf/test_generation_config_extended.yaml False)
+#endif()
diff --git a/atf_test/package.xml b/atf_test/package.xml
index 2485f6b8..96efbd12 100644
--- a/atf_test/package.xml
+++ b/atf_test/package.xml
@@ -12,6 +12,8 @@
 
     <buildtool_depend>catkin</buildtool_depend>
 
+    <exec_depend>rostest</exec_depend>
+
     <exec_depend>atf_core</exec_depend>
     <exec_depend>atf_test_tools</exec_depend>
     <exec_depend>rospy</exec_depend>