diff --git a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
index 34df1dabfd23f0428759382f09480cea443605a4..c6271cf745db0fc6060909689a790cd154514187 100644
--- a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
+++ b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
@@ -5,9 +5,9 @@
  * 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.
@@ -47,7 +47,7 @@ void tassert(bool c, const char *file, int line)
         printf("Failure.  Line %d,   file %s\n", line, file);
         errorOccurred = true;
     }
-};
+}
 
 
 #define EXCEPTION_TEST(operation, expected_exception)               \
@@ -1486,7 +1486,7 @@ int  mymain()
 
     return 0;
 
-};
+}
 
 int  main() {
    for (int i = 0; i<3; i++)
@@ -1501,4 +1501,3 @@ int  main() {
 
     return 0;
 }
-
diff --git a/tests/src/DOM/Normalizer/Normalizer.cpp b/tests/src/DOM/Normalizer/Normalizer.cpp
index 50aab70617f43be6f01d8b8ee9ed138d9925c2c7..204f28eda2bf681c6045dc7e9266b9bfecf4ffb7 100644
--- a/tests/src/DOM/Normalizer/Normalizer.cpp
+++ b/tests/src/DOM/Normalizer/Normalizer.cpp
@@ -5,9 +5,9 @@
  * 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.
@@ -141,7 +141,7 @@ Normalizer::~Normalizer() {
 }
 
 void Normalizer::printEntityRefNodes(DOMElement *ele) {
-    
+
     DOMNode *child = ele->getFirstChild();
 
     while(child != 0) {
@@ -162,7 +162,7 @@ void Normalizer::printEntityRefNodes(DOMElement *ele) {
 
         child = child->getNextSibling();
     }
-    
+
 }
 
 
@@ -186,7 +186,7 @@ bool Normalizer::handleError(const DOMError& domError)
     XERCES_STD_QUALIFIER cerr << msg <<XERCES_STD_QUALIFIER endl;
     XMLString::release(&msg);
 
- 
+
 
     // continue serialization if possible.
     return true;
@@ -200,7 +200,7 @@ DOMDocument* Normalizer::createDocument() {
 
     DOMImplementation* impl = DOMImplementationRegistry::getDOMImplementation(coreStr);
     return impl->createDocument();
-};
+}
 
 void Normalizer::serializeNode(const DOMNode * const node) {
     XMLCh tempStr[100];
@@ -250,7 +250,7 @@ int main(int /*argc*/, char ** /*argv*/) {
     normalizer->serializeNode(doc);
     XERCES_STD_QUALIFIER cout << "\n\n";
 
-    // this block is needed to destroy the XMLBuffer 
+    // this block is needed to destroy the XMLBuffer
     {
         //use a binding
         XMLBuffer buf;
@@ -282,7 +282,7 @@ int main(int /*argc*/, char ** /*argv*/) {
     doc->normalizeDocument();
     normalizer->serializeNode(doc);
     XERCES_STD_QUALIFIER cout << "\n\n";
-    
+
     //conflicting default
     docFirstElementChildChild = doc->createElementNS(X("http://www.test4.com"),X("docEleChildChild5"));
     docFirstElementChild->appendChild(docFirstElementChildChild);
@@ -320,7 +320,7 @@ int main(int /*argc*/, char ** /*argv*/) {
     docFirstElementChildChild->setAttributeNS(X("http://testattr2.com"), X("poFake:attr6"), X("value"));
     docFirstElementChildChild->setAttributeNS(X("http://testattr3.com"), X("po3:attr7"), X("value"));
     docFirstElementChildChild->setAttributeNS(X("http://testattr4.com"), X("po4:attr8"), X("value"));
-    
+
 
     //test for a clash with our NSx attrs
     docFirstElementChildChild->setAttributeNS(X("http://testclash.com"), X("NS1:attr9"), X("value"));
@@ -367,7 +367,7 @@ int main(int /*argc*/, char ** /*argv*/) {
 
     noNamespaceChild = doc->createElementNS(X("http://testclash.com"),X("NS1:testing1.1Stuff"));
     noNamespaceEle->appendChild(noNamespaceChild);
-    
+
     noNamespaceChild->setAttributeNS(X("http://www.someRandomUri.com"), X("attr"), X("value"));
     doc->normalizeDocument();
     normalizer->serializeNode(doc);
@@ -424,5 +424,3 @@ int main(int /*argc*/, char ** /*argv*/) {
 
     return 0;
 }
-
-
diff --git a/tests/src/DOM/RangeTest/RangeTest.cpp b/tests/src/DOM/RangeTest/RangeTest.cpp
index 4621f6594133c0452eb1c1bf6fc82277af1c6875..6b1a7bd9bff4380c553a907ab72ddda3de5688d9 100644
--- a/tests/src/DOM/RangeTest/RangeTest.cpp
+++ b/tests/src/DOM/RangeTest/RangeTest.cpp
@@ -5,9 +5,9 @@
  * 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.
@@ -52,7 +52,7 @@ void tassert(bool c, const char *file, int line)
         errorOccurred = true;
         printf("Failure.  Line %d,   file %s\n", line, file);
     }
-};
+}
 
 
 #define EXCEPTION_TEST(operation, expected_exception)               \
@@ -963,7 +963,4 @@ int  main()
     printf("Test Run Successfully\n");
 
     return 0;
-};
-
-
-
+}
diff --git a/tests/src/DOM/Traversal/Traversal.cpp b/tests/src/DOM/Traversal/Traversal.cpp
index fef7e1eeb4f07b8997f1fc68e794006adba53546..1cc1c590279e8f5a58203589dc6ddda04b62e4b2 100644
--- a/tests/src/DOM/Traversal/Traversal.cpp
+++ b/tests/src/DOM/Traversal/Traversal.cpp
@@ -52,7 +52,7 @@ void tassert(bool c, const char *file, int line)
         printf("Failure.  Line %d,   file %s\n", line, file);
         errorOccurred = true;
     }
-};
+}
 
 
 #define EXCEPTION_TEST(operation, expected_exception)               \
@@ -554,4 +554,4 @@ int  main()
 
     printf("Test Run Successfully\n");
     return 0;
-};
+}
diff --git a/tests/src/EncodingTest/EncodingTest.cpp b/tests/src/EncodingTest/EncodingTest.cpp
index 236cfab533dc84773f249d0d9a22470ac2dda568..9de73a5a66707e497441092478eeeb0c4803130a 100644
--- a/tests/src/EncodingTest/EncodingTest.cpp
+++ b/tests/src/EncodingTest/EncodingTest.cpp
@@ -5,9 +5,9 @@
  * 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.
@@ -79,7 +79,7 @@ void ParseErrorHandler::error(const SAXParseException& e)
     XMLString::release(&message);
     throw e;
 
-};
+}
 
 void ParseErrorHandler::fatalError(const SAXParseException& e)
 {
@@ -93,7 +93,7 @@ void ParseErrorHandler::fatalError(const SAXParseException& e)
     XMLString::release(&systemId);
     XMLString::release(&message);
     throw e;
-};
+}
 
 void ParseErrorHandler::warning(const SAXParseException& e)
 {
@@ -108,7 +108,7 @@ void ParseErrorHandler::warning(const SAXParseException& e)
     XMLString::release(&message);
     throw e;
 
-};
+}
 
 
 //------------------------------------------------------------------------
@@ -130,7 +130,7 @@ static DOMDocument* parseFile(char *fileName)
     }
     catch (const OutOfMemoryException&)
     {
-	    fprintf(stderr, "OutOfMemoryException during parsing: %s\n", fileName);        
+	    fprintf(stderr, "OutOfMemoryException during parsing: %s\n", fileName);
 	    return 0;
     }
     catch (const XMLException& e )
@@ -169,7 +169,7 @@ static void writeUData(const XMLCh* s)
         printf("%4x ", c);
     }
     printf("\n</udata>\n");
-};
+}
 
 
 
@@ -440,4 +440,4 @@ int main(int argc, char ** argv) {
     delete parser;
     parser = 0;
    return 0;
-};
+}