diff --git a/ngraph/test/CMakeLists.txt b/ngraph/test/CMakeLists.txt
index 98122ebb7b6d68..0c2f8da3e1f8d9 100644
--- a/ngraph/test/CMakeLists.txt
+++ b/ngraph/test/CMakeLists.txt
@@ -50,7 +50,6 @@ set(SRC
     ngraph_api.cpp
     node_input_output.cpp
     op.cpp
-    op_eval/atan.cpp
     op_eval/binary_convolution.cpp
     op_eval/bucketize.cpp
     op_eval/clamp.cpp
@@ -98,6 +97,7 @@ set(SRC
     type_prop/adaptive_max_pool.cpp
     type_prop/asin.cpp
     type_prop/assign.cpp
+    type_prop/atan.cpp
     type_prop/avg_pool.cpp
     type_prop/batch_norm.cpp
     type_prop/batch_to_space.cpp
diff --git a/ngraph/test/op_eval/atan.cpp b/ngraph/test/op_eval/atan.cpp
deleted file mode 100644
index 074277b01e3394..00000000000000
--- a/ngraph/test/op_eval/atan.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2018-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include <string>
-#include <vector>
-
-#include "gtest/gtest.h"
-
-#include "ngraph/op/atan.hpp"
-#include "ngraph/runtime/host_tensor.hpp"
-#include "ngraph/validation_util.hpp"
-#include "runtime/backend.hpp"
-#include "util/test_tools.hpp"
-
-using namespace std;
-using namespace ngraph;
-
-TEST(op_eval, atan)
-{
-    Shape shape{3};
-    auto p = make_shared<op::Parameter>(element::f32, shape);
-    auto atan = make_shared<op::v0::Atan>(p);
-    auto fun = make_shared<Function>(OutputVector{atan}, ParameterVector{p});
-
-    std::vector<float> inputs{-0.25f, 0.f, 0.25f};
-    std::vector<float> expected_result{-0.24497866f, 0.00000000f, 0.24497866f};
-
-    auto result = make_shared<HostTensor>();
-    ASSERT_TRUE(
-        fun->evaluate({result}, {make_host_tensor<element::Type_t::f32>(shape, inputs)}));
-    EXPECT_EQ(result->get_element_type(), element::f32);
-    EXPECT_EQ(result->get_shape(), shape);
-    auto result_data = read_vector<float>(result);
-    for (size_t i = 0; i < inputs.size(); i++)
-        EXPECT_NEAR(result_data[i], expected_result[i], 0.000001);
-}