diff --git a/UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp b/UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp
index 15c1f4fb16..4aad1cac8c 100644
--- a/UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp
+++ b/UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019 ARM Limited
+/* Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake b/UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake
index 198df4988c..857489d72d 100644
--- a/UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake
+++ b/UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake
@@ -24,4 +24,4 @@ set(unittest-test-sources
   moduletests/storage/kvstore/TDBStore/moduletest.cpp
 )
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBYPASS_NVSTORE_CHECK")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
diff --git a/UNITTESTS/stubs/EmulatedSD.cpp b/UNITTESTS/stubs/EmulatedSD.cpp
index 40337271aa..ff2192e729 100644
--- a/UNITTESTS/stubs/EmulatedSD.cpp
+++ b/UNITTESTS/stubs/EmulatedSD.cpp
@@ -1,3 +1,19 @@
+/* Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * 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.
+ */
+
 #include "EmulatedSD.h"
 #include <stdio.h>
 
diff --git a/UNITTESTS/stubs/EmulatedSD.h b/UNITTESTS/stubs/EmulatedSD.h
index 2393ac186e..ea131b403b 100644
--- a/UNITTESTS/stubs/EmulatedSD.h
+++ b/UNITTESTS/stubs/EmulatedSD.h
@@ -1,3 +1,19 @@
+/* Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * 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.
+ */
+
 #ifndef EMULATEDSD_H
 #define EMULATEDSD_H