diff --git a/docs/hacking-guide/en/building.md b/docs/hacking-guide/en/building.md
index 1b883a706d..9501343c64 100644
--- a/docs/hacking-guide/en/building.md
+++ b/docs/hacking-guide/en/building.md
@@ -11,7 +11,7 @@ still unsolved. This is specially true for the ['site' plugin](https://maven.apa
 
 #### Upgrading the `gitbook` version and regenerating the `npm-shrinkwrap.json` file
 The full release uses `gitbook` to build a static website from the documentation. This is automatically installed using
-an `NPM` plugin and is controled via a package.json file.
+an `NPM` plugin and is controlled via a package.json file.
 
 Install `NPM` using the instructions below
 
diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md
index f14fda89d1..cee06f4473 100644
--- a/docs/user-manual/en/persistence.md
+++ b/docs/user-manual/en/persistence.md
@@ -367,7 +367,7 @@ application state) using a database.  N.B. Address full policy Paging (See: [The
 supported with the JDBC persistence layer.
 
 Using the ActiveMQ Artemis File Journal is the recommended configuration as it offers higher levels of performance and is
-more mature.  The JDBC persistence layer is targetted to those users who must use a database e.g. due to internal company
+more mature.  The JDBC persistence layer is targeted to those users who must use a database e.g. due to internal company
 policy.
 
 ActiveMQ Artemis currently has support for a limited number of database vendors (older versions may work but mileage may
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/InitalReconnectDelayTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/InitalReconnectDelayTest.java
index 763a020e5c..44c2010e84 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/InitalReconnectDelayTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/InitalReconnectDelayTest.java
@@ -76,7 +76,7 @@ public class InitalReconnectDelayTest extends OpenwireArtemisBaseTest {
       producer.send(session.createTextMessage("TEST"));
       end = (new Date()).getTime();
 
-      //Inital reconnection should kick in and be darned close to what we expected
+      //Initial reconnection should kick in and be darned close to what we expected
       LOG.info("Failover took " + (end - start) + " ms.");
       assertTrue("Failover took " + (end - start) + " ms and should be > 14000.", (end - start) > 14000);
       connection.close();
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpAbstractResource.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpAbstractResource.java
index b99c56b79f..20bedcc1a2 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpAbstractResource.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpAbstractResource.java
@@ -293,7 +293,7 @@ public abstract class AmqpAbstractResource<E extends Endpoint> implements AmqpRe
    }
 
    /**
-    * When aborting the open operation, and there isnt an error condition,
+    * When aborting the open operation, and there isn't an error condition,
     * provided by the peer, the returned exception will be used instead.
     * A subclass may override this method to provide alternative behaviour.
     */
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpUnknownFilterType.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpUnknownFilterType.java
index 8a4ce6b7f7..4dacbde63d 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpUnknownFilterType.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpUnknownFilterType.java
@@ -25,10 +25,10 @@ import org.apache.qpid.proton.amqp.UnsignedLong;
  */
 public class AmqpUnknownFilterType implements DescribedType {
 
-   public static final AmqpUnknownFilterType UNKOWN_FILTER = new AmqpUnknownFilterType();
+   public static final AmqpUnknownFilterType UNKNOWN_FILTER = new AmqpUnknownFilterType();
 
    public static final UnsignedLong UNKNOWN_FILTER_CODE = UnsignedLong.valueOf(0x0000468C00000099L);
-   public static final Symbol UNKNOWN_FILTER_NAME = Symbol.valueOf("apache.org:unkown-filter:string");
+   public static final Symbol UNKNOWN_FILTER_NAME = Symbol.valueOf("apache.org:unknown-filter:string");
    public static final Object[] UNKNOWN_FILTER_IDS = new Object[]{UNKNOWN_FILTER_CODE, UNKNOWN_FILTER_NAME};
 
    private final String payload;