diff --git a/common.c b/common.c
index 540cec5..c0497fd 100644
--- a/common.c
+++ b/common.c
@@ -1,19 +1,5 @@
-/* Copyright 2016 IBM
- *
- * 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.
- *
- */
-
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 #define _GNU_SOURCE
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/common.h b/common.h
index 20dbf1a..3e22dd2 100644
--- a/common.h
+++ b/common.h
@@ -1,19 +1,5 @@
-/* Copyright 2016 IBM
- *
- * 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.
- *
- */
-
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 #ifndef COMMON_H
 #define COMMON_H
 
diff --git a/dbus.h b/dbus.h
index aa520c2..0be0240 100644
--- a/dbus.h
+++ b/dbus.h
@@ -1,19 +1,5 @@
-/*
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOX_DBUS_H
 #define MBOX_DBUS_H
diff --git a/mbox.h b/mbox.h
index e9e7c75..eca0ea1 100644
--- a/mbox.h
+++ b/mbox.h
@@ -1,19 +1,5 @@
-/*
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOX_H
 #define MBOX_H
diff --git a/mboxctl.c b/mboxctl.c
index 6e8bf15..e64a9c7 100644
--- a/mboxctl.c
+++ b/mboxctl.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Control Implementation
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <assert.h>
diff --git a/mboxd.c b/mboxd.c
index 6e95b56..b944998 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <assert.h>
diff --git a/mboxd_dbus.c b/mboxd_dbus.c
index 3f869fe..9f90e31 100644
--- a/mboxd_dbus.c
+++ b/mboxd_dbus.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon DBUS Helpers
- *
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <assert.h>
diff --git a/mboxd_dbus.h b/mboxd_dbus.h
index 8dbac5e..beb5790 100644
--- a/mboxd_dbus.h
+++ b/mboxd_dbus.h
@@ -1,19 +1,5 @@
-/*
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOXD_DBUS_H
 #define MBOXD_DBUS_H
diff --git a/mboxd_flash.h b/mboxd_flash.h
index 7c02445..3cfaef9 100644
--- a/mboxd_flash.h
+++ b/mboxd_flash.h
@@ -1,19 +1,5 @@
-/*
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOXD_FLASH_H
 #define MBOXD_FLASH_H
diff --git a/mboxd_flash_physical.c b/mboxd_flash_physical.c
index 69d2f3c..5cd5868 100644
--- a/mboxd_flash_physical.c
+++ b/mboxd_flash_physical.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Flash Helpers
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <assert.h>
diff --git a/mboxd_flash_virtual.cpp b/mboxd_flash_virtual.cpp
index 9575705..1b94ca9 100644
--- a/mboxd_flash_virtual.cpp
+++ b/mboxd_flash_virtual.cpp
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Window Helpers
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <fcntl.h>
 #include <stdint.h>
diff --git a/mboxd_lpc.c b/mboxd_lpc.c
index 0529b14..a9c686d 100644
--- a/mboxd_lpc.c
+++ b/mboxd_lpc.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon LPC Helpers
- *
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <assert.h>
diff --git a/mboxd_lpc.h b/mboxd_lpc.h
index 2c38ab0..bd3e2b1 100644
--- a/mboxd_lpc.h
+++ b/mboxd_lpc.h
@@ -1,19 +1,5 @@
-/*
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOXD_LPC_H
 #define MBOXD_LPC_H
diff --git a/mboxd_msg.c b/mboxd_msg.c
index 437c67d..46679b8 100644
--- a/mboxd_msg.c
+++ b/mboxd_msg.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon MBOX Message Helpers
- *
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <assert.h>
diff --git a/mboxd_msg.h b/mboxd_msg.h
index 7d81d7a..6ef6b27 100644
--- a/mboxd_msg.h
+++ b/mboxd_msg.h
@@ -1,19 +1,5 @@
-/*
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOXD_MSG_H
 #define MBOXD_MSG_H
diff --git a/mboxd_pnor_partition_table.cpp b/mboxd_pnor_partition_table.cpp
index 91b9880..decf048 100644
--- a/mboxd_pnor_partition_table.cpp
+++ b/mboxd_pnor_partition_table.cpp
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Window Helpers
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 #include "mboxd_pnor_partition_table.h"
 #include "common.h"
 #include "mbox.h"
diff --git a/mboxd_pnor_partition_table.h b/mboxd_pnor_partition_table.h
index beb9ced..a2b8c36 100644
--- a/mboxd_pnor_partition_table.h
+++ b/mboxd_pnor_partition_table.h
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 #pragma once
 
 #ifdef VIRTUAL_PNOR_ENABLED
diff --git a/mboxd_windows.c b/mboxd_windows.c
index afe28b2..fd679bc 100644
--- a/mboxd_windows.c
+++ b/mboxd_windows.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Window Helpers
- *
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <assert.h>
diff --git a/mboxd_windows.h b/mboxd_windows.h
index 925697c..468fd12 100644
--- a/mboxd_windows.h
+++ b/mboxd_windows.h
@@ -1,19 +1,5 @@
-/*
- * Copyright 2016 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOXD_WINDOWS_H
 #define MBOXD_WINDOWS_H
diff --git a/mtd.c b/mtd.c
index 38d6f24..348973e 100644
--- a/mtd.c
+++ b/mtd.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 #define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/pnor_partition.cpp b/pnor_partition.cpp
index 1868ed7..cdb9633 100644
--- a/pnor_partition.cpp
+++ b/pnor_partition.cpp
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 #include "pnor_partition.hpp"
 #include "config.h"
 #include "mboxd_flash.h"
diff --git a/pnor_partition.hpp b/pnor_partition.hpp
index 986ca1f..a11a921 100644
--- a/pnor_partition.hpp
+++ b/pnor_partition.hpp
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 #pragma once
 
 #include "mboxd_pnor_partition_table.h"
diff --git a/pnor_partition_defs.h b/pnor_partition_defs.h
index 309363d..447b11c 100644
--- a/pnor_partition_defs.h
+++ b/pnor_partition_defs.h
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 #pragma once
 
 #include <stdint.h>
diff --git a/pnor_partition_table.cpp b/pnor_partition_table.cpp
index cf59c41..646f0c3 100644
--- a/pnor_partition_table.cpp
+++ b/pnor_partition_table.cpp
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 #include "pnor_partition_table.hpp"
 #include "common.h"
 #include "config.h"
diff --git a/pnor_partition_table.hpp b/pnor_partition_table.hpp
index 1b932a1..796a47a 100644
--- a/pnor_partition_table.hpp
+++ b/pnor_partition_table.hpp
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 #pragma once
 
 #include <vector>
diff --git a/test/bmc_event_ack_v2.c b/test/bmc_event_ack_v2.c
index 7bfae6d..3d4cffd 100644
--- a/test/bmc_event_ack_v2.c
+++ b/test/bmc_event_ack_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <sys/mman.h>
diff --git a/test/close_window_v2.c b/test/close_window_v2.c
index 40d71ac..0e3dd55 100644
--- a/test/close_window_v2.c
+++ b/test/close_window_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/copy_flash.c b/test/copy_flash.c
index d39ef93..b8beb21 100644
--- a/test/copy_flash.c
+++ b/test/copy_flash.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/test/create_oversize_window.c b/test/create_oversize_window.c
index 713c62b..c60b19c 100644
--- a/test/create_oversize_window.c
+++ b/test/create_oversize_window.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/create_read_window_v2.c b/test/create_read_window_v2.c
index 34d6727..6085f96 100644
--- a/test/create_read_window_v2.c
+++ b/test/create_read_window_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/create_write_window_v2.c b/test/create_write_window_v2.c
index 3682b72..2ec59d6 100644
--- a/test/create_write_window_v2.c
+++ b/test/create_write_window_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/create_zero_size_window.c b/test/create_zero_size_window.c
index d867d46..4f26cd7 100644
--- a/test/create_zero_size_window.c
+++ b/test/create_zero_size_window.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/erase_flash.c b/test/erase_flash.c
index fa8c92c..376b7d5 100644
--- a/test/erase_flash.c
+++ b/test/erase_flash.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <stdarg.h>
diff --git a/test/get_flash_info_v2.c b/test/get_flash_info_v2.c
index 38af007..ccb1473 100644
--- a/test/get_flash_info_v2.c
+++ b/test/get_flash_info_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/get_mbox_info_v2.c b/test/get_mbox_info_v2.c
index 3a86f94..2149737 100644
--- a/test/get_mbox_info_v2.c
+++ b/test/get_mbox_info_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/get_mbox_info_v2_timeout.c b/test/get_mbox_info_v2_timeout.c
index 49cdfb8..8587dfe 100644
--- a/test/get_mbox_info_v2_timeout.c
+++ b/test/get_mbox_info_v2_timeout.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/implicit_flush.c b/test/implicit_flush.c
index 57676b8..a09b034 100644
--- a/test/implicit_flush.c
+++ b/test/implicit_flush.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <sys/mman.h>
diff --git a/test/invalid_command.c b/test/invalid_command.c
index 80ee9e2..d277551 100644
--- a/test/invalid_command.c
+++ b/test/invalid_command.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/mark_read_dirty.c b/test/mark_read_dirty.c
index 9be35a4..36e14bd 100644
--- a/test/mark_read_dirty.c
+++ b/test/mark_read_dirty.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/mark_write_dirty_v2.c b/test/mark_write_dirty_v2.c
index 9993667..2ea12ae 100644
--- a/test/mark_write_dirty_v2.c
+++ b/test/mark_write_dirty_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/mark_write_erased_v2.c b/test/mark_write_erased_v2.c
index 46027e6..09efc2a 100644
--- a/test/mark_write_erased_v2.c
+++ b/test/mark_write_erased_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <sys/mman.h>
diff --git a/test/mbox.c b/test/mbox.c
index c3b3574..3dc1611 100644
--- a/test/mbox.c
+++ b/test/mbox.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE /* fallocate */
 #include <assert.h>
diff --git a/test/mbox.h b/test/mbox.h
index 929ca22..5b89790 100644
--- a/test/mbox.h
+++ b/test/mbox.h
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef TEST_MBOX_H
 #define TEST_MBOX_H
diff --git a/test/read_window_cycle.c b/test/read_window_cycle.c
index e1d1b48..c2f8920 100644
--- a/test/read_window_cycle.c
+++ b/test/read_window_cycle.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/read_window_mark_write_erased.c b/test/read_window_mark_write_erased.c
index 49cb4b4..7daf9a1 100644
--- a/test/read_window_mark_write_erased.c
+++ b/test/read_window_mark_write_erased.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/read_window_write_flush.c b/test/read_window_write_flush.c
index 357a132..01bbba4 100644
--- a/test/read_window_write_flush.c
+++ b/test/read_window_write_flush.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/request_high_version.c b/test/request_high_version.c
index 679211c..b85e63f 100644
--- a/test/request_high_version.c
+++ b/test/request_high_version.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/request_low_version.c b/test/request_low_version.c
index 9f26e72..5f003f4 100644
--- a/test/request_low_version.c
+++ b/test/request_low_version.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/reset_state.c b/test/reset_state.c
index 3b2c109..b110f44 100644
--- a/test/reset_state.c
+++ b/test/reset_state.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/sanity.c b/test/sanity.c
index f96c35b..3c573ec 100644
--- a/test/sanity.c
+++ b/test/sanity.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Implementation
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 int main(void)
 {
 #ifdef NDEBUG
diff --git a/test/sequence_numbers.c b/test/sequence_numbers.c
index be95d87..3d7d6e9 100644
--- a/test/sequence_numbers.c
+++ b/test/sequence_numbers.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 
diff --git a/test/system.c b/test/system.c
index 2068fb9..24fbcdc 100644
--- a/test/system.c
+++ b/test/system.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <linux/types.h>
 #include <mtd/mtd-user.h>
diff --git a/test/system.h b/test/system.h
index a489e51..a72fc3c 100644
--- a/test/system.h
+++ b/test/system.h
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef TEST_SYSTEM_H
 #define TEST_SYSTEM_H
diff --git a/test/tmpf.c b/test/tmpf.c
index e9cc558..483231b 100644
--- a/test/tmpf.c
+++ b/test/tmpf.c
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Temporary File helpers
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #define _GNU_SOURCE
 #include <stdio.h>
diff --git a/test/tmpf.h b/test/tmpf.h
index cb1bda4..9232e3e 100644
--- a/test/tmpf.h
+++ b/test/tmpf.h
@@ -1,21 +1,5 @@
-/*
- * Mailbox Daemon Temporary File helpers
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright (C) 2018 IBM Corp. */
 
 #ifndef MBOX_TEST_UTILS_H
 #define MBOX_TEST_UTILS_H
diff --git a/test/vpnor/create_pnor_partition_table.cpp b/test/vpnor/create_pnor_partition_table.cpp
index b3475d0..12dd2e6 100644
--- a/test/vpnor/create_pnor_partition_table.cpp
+++ b/test/vpnor/create_pnor_partition_table.cpp
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2018 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 #include "pnor_partition_table.hpp"
 #include "config.h"
 #include <assert.h>
diff --git a/test/write_flash.c b/test/write_flash.c
index 6a92d4b..4828cdd 100644
--- a/test/write_flash.c
+++ b/test/write_flash.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/write_flush_v2.c b/test/write_flush_v2.c
index 63cc666..c762a76 100644
--- a/test/write_flush_v2.c
+++ b/test/write_flush_v2.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <sys/mman.h>
diff --git a/test/write_window_dirty_erase.c b/test/write_window_dirty_erase.c
index c29c095..03e7d38 100644
--- a/test/write_window_dirty_erase.c
+++ b/test/write_window_dirty_erase.c
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2017 IBM
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include <assert.h>
 #include <sys/mman.h>