diff --git a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PostConstruct.java b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PostConstruct.java
index 118a0a45..b676c958 100644
--- a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PostConstruct.java
+++ b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PostConstruct.java
@@ -36,5 +36,6 @@
 @Target( value = { ElementType.METHOD } )
 @Retention( RetentionPolicy.RUNTIME )
 @Documented
-public @interface PostConstruct {
+public @interface PostConstruct
+{
 }
diff --git a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PreDestroy.java b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PreDestroy.java
index 207c21ac..15f96fb0 100644
--- a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PreDestroy.java
+++ b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PreDestroy.java
@@ -38,5 +38,6 @@
 @Target( value = { ElementType.METHOD } )
 @Retention( RetentionPolicy.RUNTIME )
 @Documented
-public @interface PreDestroy {
+public @interface PreDestroy
+{
 }
diff --git a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/LifecycleBuilder.java b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/LifecycleBuilder.java
index ece4ce9b..7795127d 100644
--- a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/LifecycleBuilder.java
+++ b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/LifecycleBuilder.java
@@ -29,8 +29,8 @@ final class LifecycleBuilder
         boolean hasJsr250Annotations;
         try
         {
-            hasJsr250Annotations = javax.annotation.PostConstruct.class.isAnnotation()
-                    && javax.annotation.PreDestroy.class.isAnnotation();
+            hasJsr250Annotations =
+                javax.annotation.PostConstruct.class.isAnnotation() && javax.annotation.PreDestroy.class.isAnnotation();
         }
         catch ( final LinkageError e )
         {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/BaseTests.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/BaseTests.java
index 65d656af..e094bfe7 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/BaseTests.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/BaseTests.java
@@ -20,9 +20,9 @@
 /**
  * Marks base tests that don't depend on Guice or injection.
  */
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Tag("base")
+@Target( { ElementType.TYPE, ElementType.METHOD } )
+@Retention( RetentionPolicy.RUNTIME )
+@Tag( "base" )
 public @interface BaseTests
 {
     // marker
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/DefaultBeanLocatorTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/DefaultBeanLocatorTest.java
index 4b9dcd27..90c1becc 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/DefaultBeanLocatorTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/DefaultBeanLocatorTest.java
@@ -47,7 +47,8 @@ class DefaultBeanLocatorTest
     Injector child4;
 
     @BeforeEach
-    public void setUp() throws Exception
+    public void setUp()
+        throws Exception
     {
         parent = Guice.createInjector( new AbstractModule()
         {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/ImplementationsTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/ImplementationsTest.java
index 232240ce..cc889bcb 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/ImplementationsTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/ImplementationsTest.java
@@ -43,7 +43,8 @@ class ImplementationsTest
     Injector injector;
 
     @BeforeEach
-    void setUp() throws Exception
+    void setUp()
+        throws Exception
     {
         injector = Guice.createInjector( new AbstractModule()
         {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LocatedBeansTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LocatedBeansTest.java
index 6d14d995..4f5e519d 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LocatedBeansTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LocatedBeansTest.java
@@ -72,7 +72,8 @@ public Bean get()
     Injector injector;
 
     @BeforeEach
-    void setUp() throws Exception
+    void setUp()
+        throws Exception
     {
         injector = Guice.createInjector( new AbstractModule()
         {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LogsTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LogsTest.java
index 1c04503e..210b0ea9 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LogsTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/LogsTest.java
@@ -30,7 +30,8 @@ void testLogging()
     }
 
     @Test
-    void testProductionLogging() throws Exception
+    void testProductionLogging()
+        throws Exception
     {
         try
         {
@@ -59,7 +60,8 @@ protected synchronized Class<?> loadClass( final String name, final boolean reso
     }
 
     @Test
-    void testFallBackToJDKLogging() throws Exception
+    void testFallBackToJDKLogging()
+        throws Exception
     {
         final Logger rootLogger = Logger.getLogger( "" );
 
@@ -102,7 +104,8 @@ protected synchronized Class<?> loadClass( final String name, final boolean reso
     }
 
     @Test
-    void testConsoleLogging() throws Exception
+    void testConsoleLogging()
+        throws Exception
     {
         System.setProperty( "org.eclipse.sisu.log", "console" );
         try
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildElementsTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildElementsTest.java
index 1d4f4565..d1d55ad2 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildElementsTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildElementsTest.java
@@ -41,7 +41,7 @@ void testWeakElements()
         testElements( false );
     }
 
-    private static void testElements(final boolean soft)
+    private static void testElements( final boolean soft )
     {
         final Collection<String> names = new MildElements<String>( new ArrayList<Reference<String>>(), soft );
 
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildKeysTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildKeysTest.java
index 0d90f6b1..f1062482 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildKeysTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildKeysTest.java
@@ -41,7 +41,7 @@ void testWeakKeys()
         testKeys( false );
     }
 
-    private static void testKeys(final boolean soft)
+    private static void testKeys( final boolean soft )
     {
         final Map<String, String> names =
             new MildKeys<String, String>( new LinkedHashMap<Reference<String>, String>(), soft );
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildValuesTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildValuesTest.java
index 0e1d1d9d..b6302aee 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildValuesTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/MildValuesTest.java
@@ -41,7 +41,7 @@ void testWeakValues()
         testValues( false );
     }
 
-    private static void testValues(final boolean soft)
+    private static void testValues( final boolean soft )
     {
         final Map<String, String> names =
             new MildValues<String, String>( new LinkedHashMap<String, Reference<String>>(), soft );
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/TypeArgumentsTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/TypeArgumentsTest.java
index 5c3a0580..b103991d 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/TypeArgumentsTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/TypeArgumentsTest.java
@@ -272,7 +272,7 @@ public List call()
         }
     }
 
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings( "rawtypes" )
     @Test
     void testIsAssignableFrom()
     {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/WatchedBeansTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/WatchedBeansTest.java
index f28bf3fa..58b8be0b 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/WatchedBeansTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/inject/WatchedBeansTest.java
@@ -45,7 +45,8 @@ class WatchedBeansTest
     Injector child3;
 
     @BeforeEach
-    void setUp() throws Exception
+    void setUp()
+        throws Exception
     {
         parent = Guice.createInjector( new AbstractModule()
         {
@@ -101,7 +102,7 @@ public void remove( final BeanEntry<Named, Bean> entry, final RankedSequence<Str
         }
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings( { "rawtypes", "unchecked" } )
     @Test
     void testWatchedBeans()
     {
@@ -205,7 +206,7 @@ public void remove( final BeanEntry<Named, Bean> entry, final Object watcher )
         }
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings( { "rawtypes", "unchecked" } )
     @Test
     void testBrokenWatcher()
     {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BeanWatcherTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BeanWatcherTest.java
index 2e859127..aa2435b1 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BeanWatcherTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BeanWatcherTest.java
@@ -176,7 +176,7 @@ public void remove( final BeanEntry<Annotation, Item> bean, final AnnotatedItemW
 
     @BeforeEach
     public void setUp()
-throws Exception
+        throws Exception
     {
         final ClassSpace space =
             new URLClassSpace( getClass().getClassLoader(), new URL[] { getClass().getResource( "" ) } );
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BundleClassSpaceTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BundleClassSpaceTest.java
index 98e28237..6dbfaeb6 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BundleClassSpaceTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/BundleClassSpaceTest.java
@@ -51,7 +51,8 @@ class BundleClassSpaceTest
     private Framework framework;
 
     @BeforeEach
-    void setUp() throws Exception
+    void setUp()
+        throws Exception
     {
 
         final Map<String, String> configuration = new HashMap<String, String>();
@@ -64,14 +65,16 @@ void setUp() throws Exception
     }
 
     @AfterEach
-    void tearDown() throws Exception
+    void tearDown()
+        throws Exception
     {
         framework.stop();
         framework.waitForStop( 0 );
     }
 
     @Test
-    void testHashCodeAndEquals() throws Exception
+    void testHashCodeAndEquals()
+        throws Exception
     {
         final Bundle testBundle = framework.getBundleContext().installBundle( LOGGING_BUNDLE.toString() );
         final ClassSpace space = new BundleClassSpace( testBundle );
@@ -113,7 +116,8 @@ public Enumeration<URL> findEntries( final String path, final String glob, final
     }
 
     @Test
-    void testClassSpaceResources() throws Exception
+    void testClassSpaceResources()
+        throws Exception
     {
         final Bundle testBundle1 = framework.getBundleContext().installBundle( LOGGING_BUNDLE.toString() );
         final ClassSpace space1 = new BundleClassSpace( testBundle1 );
@@ -176,7 +180,8 @@ void testClassSpaceResources() throws Exception
     }
 
     @Test
-    void testDeferredClass() throws Exception
+    void testDeferredClass()
+        throws Exception
     {
         final Bundle testBundle = framework.getBundleContext().installBundle( LOGGING_BUNDLE.toString() );
         final ClassSpace space = new BundleClassSpace( testBundle );
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/DeferredClassTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/DeferredClassTest.java
index 9b736f45..769bbd97 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/DeferredClassTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/DeferredClassTest.java
@@ -33,7 +33,8 @@ class DeferredClassTest
     URLClassLoader testLoader;
 
     @BeforeEach
-    void setUp() throws MalformedURLException
+    void setUp()
+        throws MalformedURLException
     {
         testLoader =
             URLClassLoader.newInstance( new URL[] { new File( "target/test-classes" ).toURI().toURL() }, null );
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/FileEntryIteratorTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/FileEntryIteratorTest.java
index 2968d673..6bf28ead 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/FileEntryIteratorTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/FileEntryIteratorTest.java
@@ -37,7 +37,8 @@
 class FileEntryIteratorTest
 {
     @Test
-    void testURLtoFile() throws MalformedURLException
+    void testURLtoFile()
+        throws MalformedURLException
     {
         assertEquals( "test", FileEntryIterator.toFile( new URL( "file:test" ) ).getPath() );
         assertEquals( "A B C", FileEntryIterator.toFile( new URL( "file:A B C" ) ).getPath() );
@@ -47,7 +48,8 @@ void testURLtoFile() throws MalformedURLException
     }
 
     @Test
-    void testNoSuchFile() throws Exception
+    void testNoSuchFile()
+        throws Exception
     {
         final Iterator<String> i = new FileEntryIterator( new URL( "file:UNKNOWN" ), "", true );
         assertFalse( i.hasNext() );
@@ -62,7 +64,8 @@ void testNoSuchFile() throws Exception
     }
 
     @Test
-    void testEmptyFolder() throws Exception
+    void testEmptyFolder()
+        throws Exception
     {
         final Iterator<String> i = new FileEntryIterator( expand( resource( "empty.zip" ) ), "", true );
         assertFalse( i.hasNext() );
@@ -77,7 +80,8 @@ void testEmptyFolder() throws Exception
     }
 
     @Test
-    void testTrivialFolder() throws Exception
+    void testTrivialFolder()
+        throws Exception
     {
         final Iterator<String> i = new FileEntryIterator( expand( resource( "empty.jar" ) ), "", true );
         assertTrue( i.hasNext() );
@@ -96,7 +100,8 @@ void testTrivialFolder() throws Exception
     }
 
     @Test
-    void testSimpleFolder() throws Exception
+    void testSimpleFolder()
+        throws Exception
     {
         final Iterator<String> i = new FileEntryIterator( expand( resource( "simple.jar" ) ), "", true );
 
@@ -126,7 +131,8 @@ void testSimpleFolder() throws Exception
     }
 
     @Test
-    void testNoRecursion() throws Exception
+    void testNoRecursion()
+        throws Exception
     {
         final Iterator<String> i = new FileEntryIterator( expand( resource( "simple.jar" ) ), "", false );
 
@@ -147,7 +153,8 @@ void testNoRecursion() throws Exception
     }
 
     @Test
-    void testSubPath() throws Exception
+    void testSubPath()
+        throws Exception
     {
         final Iterator<String> i = new FileEntryIterator( expand( resource( "simple.jar" ) ), "a/b", true );
 
@@ -165,7 +172,8 @@ void testSubPath() throws Exception
     }
 
     @Test
-    void testRemoveNotSupported() throws IOException
+    void testRemoveNotSupported()
+        throws IOException
     {
         final Iterator<String> i = new FileEntryIterator( new URL( "file:" ), "", false );
         try
@@ -184,7 +192,7 @@ static URL expand( final URL url )
         final File jar = new File( url.toURI() );
         final File dir = new File( jar.getParentFile(), jar.getName() + "_expanded" );
 
-        try( final ZipFile zip = new ZipFile( jar ) )
+        try ( final ZipFile zip = new ZipFile( jar ) )
         {
             for ( final Enumeration<? extends ZipEntry> e = zip.entries(); e.hasMoreElements(); )
             {
@@ -192,7 +200,7 @@ static URL expand( final URL url )
                 final File path = new File( dir, entry.getName() );
                 if ( !path.toPath().normalize().startsWith( dir.toPath().normalize() ) )
                 {
-                    throw new IOException("Bad zip entry");
+                    throw new IOException( "Bad zip entry" );
                 }
                 if ( entry.isDirectory() )
                 {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedScanningTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedScanningTest.java
index b3f6a3a1..351771c1 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedScanningTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedScanningTest.java
@@ -215,7 +215,8 @@ void testIndexedScanning()
     }
 
     @Test
-    void testBrokenScanning() throws IOException
+    void testBrokenScanning()
+        throws IOException
     {
         final ClassSpace space =
             new URLClassSpace( getClass().getClassLoader(), new URL[] { getClass().getResource( "" ) } );
@@ -287,7 +288,8 @@ public Enumeration<URL> findEntries( final String path, final String glob, final
     }
 
     @Test
-    void testSourceDetection() throws MalformedURLException
+    void testSourceDetection()
+        throws MalformedURLException
     {
         final TestListener listener = new TestListener();
 
@@ -329,7 +331,8 @@ void testSourceDetection() throws MalformedURLException
     }
 
     @Test
-    void testOptionalLogging() throws Exception
+    void testOptionalLogging()
+        throws Exception
     {
         final Level level = Logger.getLogger( "" ).getLevel();
         try
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedTypesTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedTypesTest.java
index 9b38968c..0058099e 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedTypesTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/QualifiedTypesTest.java
@@ -229,7 +229,8 @@ public String call()
     private Injector injector;
 
     @BeforeEach
-    void setUp() throws Exception
+    void setUp()
+        throws Exception
     {
         final ClassSpace space =
             new URLClassSpace( getClass().getClassLoader(), new URL[] { getClass().getResource( "" ) } );
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ResourceEnumerationTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ResourceEnumerationTest.java
index 1f4d15cf..c3e201e1 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ResourceEnumerationTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ResourceEnumerationTest.java
@@ -32,7 +32,8 @@ class ResourceEnumerationTest
         ZipEntryIteratorTest.class.getResource( "commons-logging-1.1.1.jar" );
 
     @Test
-    void testResourceEnumeration() throws Exception
+    void testResourceEnumeration()
+        throws Exception
     {
         final Enumeration<URL> e =
             new ResourceEnumeration( null, null, true,
@@ -188,7 +189,8 @@ void testNonRecursiveSubPathEnumeration()
     }
 
     @Test
-    void testBrokenUrlEnumeration() throws Exception
+    void testBrokenUrlEnumeration()
+        throws Exception
     {
         final Enumeration<URL> e =
             new ResourceEnumeration( null, null, true, new URL[] { expand( COMMONS_LOGGING_JAR ) } );
@@ -200,6 +202,8 @@ void testBrokenUrlEnumeration() throws Exception
         nextEntryName.setAccessible( true );
         nextEntryName.set( e, "foo:" );
 
-        assertThrows( IllegalStateException.class, () -> { e.nextElement(); } );
+        assertThrows( IllegalStateException.class, () -> {
+            e.nextElement();
+        } );
     }
 }
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/URLClassSpaceTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/URLClassSpaceTest.java
index a1099d76..64bcd070 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/URLClassSpaceTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/URLClassSpaceTest.java
@@ -116,7 +116,8 @@ public Enumeration<URL> findEntries( final String path, final String glob, final
     }
 
     @Test
-    void testClassSpaceResources() throws IOException
+    void testClassSpaceResources()
+        throws IOException
     {
         final ClassSpace space = new URLClassSpace( URLClassLoader.newInstance( new URL[] { COMMONS_LOGGING_JAR } ) );
         Enumeration<URL> e;
@@ -149,7 +150,8 @@ void testClassSpaceResources() throws IOException
     }
 
     @Test
-    void testClassPathExpansion() throws IOException
+    void testClassPathExpansion()
+        throws IOException
     {
         final URLClassSpace space = new URLClassSpace( URLClassLoader.newInstance( new URL[] { SIMPLE_JAR,
             CLASS_PATH_JAR, new URL( "oops:bad/" ), CLASS_PATH_JAR, CORRUPT_MANIFEST } ) );
@@ -240,7 +242,8 @@ public URL[] getURLs()
     }
 
     @Test
-    void testJarProtocol() throws MalformedURLException
+    void testJarProtocol()
+        throws MalformedURLException
     {
         final URLClassSpace space =
             new URLClassSpace( URLClassLoader.newInstance( new URL[] { new URL( "jar:" + CLASS_PATH_JAR + "!/" ) } ) );
@@ -258,7 +261,8 @@ void testJarProtocol() throws MalformedURLException
     }
 
     @Test
-    void testNestedWar() throws MalformedURLException
+    void testNestedWar()
+        throws MalformedURLException
     {
         final URLClassSpace space = new URLClassSpace( URLClassLoader.newInstance( new URL[] {
             new URL( "jar:" + NESTED_WAR + "!/WEB-INF/classes/" ),
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ZipEntryIteratorTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ZipEntryIteratorTest.java
index 4abb3780..25fefe7f 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ZipEntryIteratorTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/space/ZipEntryIteratorTest.java
@@ -27,7 +27,8 @@
 class ZipEntryIteratorTest
 {
     @Test
-    void testNonJar() throws IOException
+    void testNonJar()
+        throws IOException
     {
         final Iterator<String> i = new ZipEntryIterator( new URL( "file:" ) );
         assertFalse( i.hasNext() );
@@ -140,7 +141,8 @@ void testSimpleJar()
     }
 
     @Test
-    void testEmbeddedZip() throws MalformedURLException
+    void testEmbeddedZip()
+        throws MalformedURLException
     {
         final Iterator<String> i =
             new ZipEntryIterator( new URL( "jar:" + resource( "embedded.zip" ) + "!/simple.zip" ) );
@@ -179,7 +181,8 @@ void testBrokenJar()
     }
 
     @Test
-    void testRemoveNotSupported() throws IOException
+    void testRemoveNotSupported()
+        throws IOException
     {
         final Iterator<String> i = new ZipEntryIterator( new URL( "file:" ) );
         try
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/BeanImportTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/BeanImportTest.java
index 6498830e..56ff9e0e 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/BeanImportTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/BeanImportTest.java
@@ -886,7 +886,7 @@ protected void configure()
         assertFalse( itr.hasNext() );
     }
 
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testDynamicProxy()
     {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryListAdapterTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryListAdapterTest.java
index e30253ba..6e450f64 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryListAdapterTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryListAdapterTest.java
@@ -32,7 +32,7 @@
 @BaseTests
 class EntryListAdapterTest
 {
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testListSize()
     {
@@ -87,7 +87,7 @@ void testEmptyList()
         assertEquals( -1, i.previousIndex() );
     }
 
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testInvalidListIterator()
     {
@@ -116,7 +116,7 @@ void testInvalidListIterator()
         }
     }
 
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testIterator()
     {
@@ -158,7 +158,7 @@ void testIterator()
         }
     }
 
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testListIterator()
     {
@@ -257,7 +257,7 @@ void testListIterator()
         assertEquals( 0, i.previousIndex() );
     }
 
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testVanishingList()
     {
@@ -309,7 +309,7 @@ void testVanishingList()
         assertEquals( 0, i.previousIndex() );
     }
 
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testCachedList()
     {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryMapAdapterTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryMapAdapterTest.java
index f0d6ebe8..88c30aa9 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryMapAdapterTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/EntryMapAdapterTest.java
@@ -23,7 +23,7 @@
 @BaseTests
 class EntryMapAdapterTest
 {
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testMapSize()
     {
@@ -43,7 +43,7 @@ void testMapSize()
         assertEquals( 2, adapter.size() );
     }
 
-    @SuppressWarnings("boxing")
+    @SuppressWarnings( "boxing" )
     @Test
     void testMapEquality()
     {
diff --git a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/ParametersTest.java b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/ParametersTest.java
index 75845a41..fb3eb95f 100644
--- a/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/ParametersTest.java
+++ b/org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/wire/ParametersTest.java
@@ -51,7 +51,7 @@ protected void configure()
         assertEquals( 0, arguments.length );
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings( { "unchecked", "rawtypes" } )
     @Test
     void testCustomParameters()
     {