diff --git a/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/TavernaCommandLineTest.java b/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/TavernaCommandLineTest.java
index 2ed7a11..b99885f 100644
--- a/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/TavernaCommandLineTest.java
+++ b/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/TavernaCommandLineTest.java
@@ -1,23 +1,21 @@
-/*******************************************************************************
- * Copyright (C) 2012 The University of Manchester
- *
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you 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.
+*/
 package org.apache.taverna.commandline;
 
 import static org.junit.Assert.assertArrayEquals;
@@ -59,8 +57,6 @@
 
 /**
  * Regression tests for Taverna Command Line Tool.
- *
- * @author David Withers
  */
 @RunWith(WorkflowTestSuite.class)
 public class TavernaCommandLineTest {
diff --git a/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestRunner.java b/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestRunner.java
index 7fca90e..cb47efb 100644
--- a/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestRunner.java
+++ b/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestRunner.java
@@ -1,23 +1,21 @@
-/*******************************************************************************
- * Copyright (C) 2012 The University of Manchester
- *
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you 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.
+*/
 package org.apache.taverna.commandline;
 
 import java.io.File;
@@ -32,7 +30,6 @@
 /**
  * Test runner for running workflows.
  *
- * @author David Withers
  */
 public class WorkflowTestRunner extends BlockJUnit4ClassRunner {
 	private File workflow;
diff --git a/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestSuite.java b/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestSuite.java
index a441aea..0fadd32 100644
--- a/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestSuite.java
+++ b/taverna-commandline-tests/src/test/java/org/apache/taverna/commandline/WorkflowTestSuite.java
@@ -1,23 +1,21 @@
-/*******************************************************************************
- * Copyright (C) 2012 The University of Manchester
- *
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you 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.
+*/
 package org.apache.taverna.commandline;
 
 import java.io.File;
@@ -37,8 +35,6 @@
 
 /**
  * Test suite for running workflows specified by a method annotated by &#064;Workflows.
- *
- * @author David Withers
  */
 public class WorkflowTestSuite extends Suite {