diff --git a/features/frameworks/utest/source/utest_harness.cpp b/features/frameworks/utest/source/utest_harness.cpp
index a796c020f0..63e1aaae55 100644
--- a/features/frameworks/utest/source/utest_harness.cpp
+++ b/features/frameworks/utest/source/utest_harness.cpp
@@ -36,7 +36,7 @@ namespace
 
     const Case *case_current = NULL;
     size_t case_index = 0;
-    control_t case_control = control_t(REPEAT_SETUP_TEARDOWN);
+    base_control_t case_control =  { REPEAT_SETUP_TEARDOWN, TIMEOUT_UNDECLR };
     size_t case_repeat_count = 1;
 
     void *case_timeout_handle = NULL;
diff --git a/features/frameworks/utest/utest/utest_types.h b/features/frameworks/utest/utest/utest_types.h
index b3afbf2271..1d66bb88e5 100644
--- a/features/frameworks/utest/utest/utest_types.h
+++ b/features/frameworks/utest/utest/utest_types.h
@@ -207,14 +207,6 @@ namespace v1 {
             return timeout;
         }
 
-        operator base_control_t() const {
-            base_control_t result = { 
-                repeat,
-                timeout
-            };
-            return result;
-        }
-
     private:
         static base_control_t make_base_control_t(repeat_t repeat, uint32_t timeout) {
             base_control_t result = {