diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 54e252c333b0bae95538779657fb99a22b3cb64e..105a52cf1b9a2539fa721e6f31d97cafa04e217b 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -957,6 +957,7 @@ testParseDomains(testDriverPtr privconn,
     return ret;
 }
 
+
 static int
 testParseNetworks(testDriverPtr privconn,
                   const char *file,
@@ -996,6 +997,7 @@ testParseNetworks(testDriverPtr privconn,
     return ret;
 }
 
+
 static int
 testParseInterfaces(testDriverPtr privconn,
                     const char *file,
@@ -3223,8 +3225,9 @@ testNetworkObjFindByUUID(testDriverPtr privconn,
 }
 
 
-static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn,
-                                             const unsigned char *uuid)
+static virNetworkPtr
+testNetworkLookupByUUID(virConnectPtr conn,
+                        const unsigned char *uuid)
 {
     testDriverPtr privconn = conn->privateData;
     virNetworkObjPtr net;
@@ -3256,8 +3259,9 @@ testNetworkObjFindByName(testDriverPtr privconn,
 }
 
 
-static virNetworkPtr testNetworkLookupByName(virConnectPtr conn,
-                                             const char *name)
+static virNetworkPtr
+testNetworkLookupByName(virConnectPtr conn,
+                        const char *name)
 {
     testDriverPtr privconn = conn->privateData;
     virNetworkObjPtr net;
@@ -3274,7 +3278,8 @@ static virNetworkPtr testNetworkLookupByName(virConnectPtr conn,
 }
 
 
-static int testConnectNumOfNetworks(virConnectPtr conn)
+static int
+testConnectNumOfNetworks(virConnectPtr conn)
 {
     testDriverPtr privconn = conn->privateData;
     int numActive;
@@ -3284,7 +3289,12 @@ static int testConnectNumOfNetworks(virConnectPtr conn)
     return numActive;
 }
 
-static int testConnectListNetworks(virConnectPtr conn, char **const names, int nnames) {
+
+static int
+testConnectListNetworks(virConnectPtr conn,
+                        char **const names,
+                        int nnames)
+{
     testDriverPtr privconn = conn->privateData;
     int n;
 
@@ -3293,7 +3303,9 @@ static int testConnectListNetworks(virConnectPtr conn, char **const names, int n
     return n;
 }
 
-static int testConnectNumOfDefinedNetworks(virConnectPtr conn)
+
+static int
+testConnectNumOfDefinedNetworks(virConnectPtr conn)
 {
     testDriverPtr privconn = conn->privateData;
     int numInactive;
@@ -3303,7 +3315,12 @@ static int testConnectNumOfDefinedNetworks(virConnectPtr conn)
     return numInactive;
 }
 
-static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) {
+
+static int
+testConnectListDefinedNetworks(virConnectPtr conn,
+                               char **const names,
+                               int nnames)
+{
     testDriverPtr privconn = conn->privateData;
     int n;
 
@@ -3312,6 +3329,7 @@ static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names
     return n;
 }
 
+
 static int
 testConnectListAllNetworks(virConnectPtr conn,
                            virNetworkPtr **nets,
@@ -3324,7 +3342,9 @@ testConnectListAllNetworks(virConnectPtr conn,
     return virNetworkObjListExport(conn, privconn->networks, nets, NULL, flags);
 }
 
-static int testNetworkIsActive(virNetworkPtr net)
+
+static int
+testNetworkIsActive(virNetworkPtr net)
 {
     testDriverPtr privconn = net->conn->privateData;
     virNetworkObjPtr obj;
@@ -3340,7 +3360,9 @@ static int testNetworkIsActive(virNetworkPtr net)
     return ret;
 }
 
-static int testNetworkIsPersistent(virNetworkPtr net)
+
+static int
+testNetworkIsPersistent(virNetworkPtr net)
 {
     testDriverPtr privconn = net->conn->privateData;
     virNetworkObjPtr obj;
@@ -3357,7 +3379,8 @@ static int testNetworkIsPersistent(virNetworkPtr net)
 }
 
 
-static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml)
+static virNetworkPtr
+testNetworkCreateXML(virConnectPtr conn, const char *xml)
 {
     testDriverPtr privconn = conn->privateData;
     virNetworkDefPtr def;
@@ -3388,8 +3411,10 @@ static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml)
     return ret;
 }
 
-static
-virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml)
+
+static virNetworkPtr
+testNetworkDefineXML(virConnectPtr conn,
+                     const char *xml)
 {
     testDriverPtr privconn = conn->privateData;
     virNetworkDefPtr def;
@@ -3417,7 +3442,9 @@ virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml)
     return ret;
 }
 
-static int testNetworkUndefine(virNetworkPtr network)
+
+static int
+testNetworkUndefine(virNetworkPtr network)
 {
     testDriverPtr privconn = network->conn->privateData;
     virNetworkObjPtr privnet;
@@ -3446,6 +3473,7 @@ static int testNetworkUndefine(virNetworkPtr network)
     return ret;
 }
 
+
 static int
 testNetworkUpdate(virNetworkPtr net,
                   unsigned int command,
@@ -3488,7 +3516,9 @@ testNetworkUpdate(virNetworkPtr net,
     return ret;
 }
 
-static int testNetworkCreate(virNetworkPtr network)
+
+static int
+testNetworkCreate(virNetworkPtr network)
 {
     testDriverPtr privconn = network->conn->privateData;
     virNetworkObjPtr privnet;
@@ -3516,7 +3546,9 @@ static int testNetworkCreate(virNetworkPtr network)
     return ret;
 }
 
-static int testNetworkDestroy(virNetworkPtr network)
+
+static int
+testNetworkDestroy(virNetworkPtr network)
 {
     testDriverPtr privconn = network->conn->privateData;
     virNetworkObjPtr privnet;
@@ -3541,8 +3573,10 @@ static int testNetworkDestroy(virNetworkPtr network)
     return ret;
 }
 
-static char *testNetworkGetXMLDesc(virNetworkPtr network,
-                                   unsigned int flags)
+
+static char *
+testNetworkGetXMLDesc(virNetworkPtr network,
+                      unsigned int flags)
 {
     testDriverPtr privconn = network->conn->privateData;
     virNetworkObjPtr privnet;
@@ -3560,7 +3594,10 @@ static char *testNetworkGetXMLDesc(virNetworkPtr network,
     return ret;
 }
 
-static char *testNetworkGetBridgeName(virNetworkPtr network) {
+
+static char *
+testNetworkGetBridgeName(virNetworkPtr network)
+{
     testDriverPtr privconn = network->conn->privateData;
     char *bridge = NULL;
     virNetworkObjPtr privnet;
@@ -3582,8 +3619,10 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) {
     return bridge;
 }
 
-static int testNetworkGetAutostart(virNetworkPtr network,
-                                   int *autostart)
+
+static int
+testNetworkGetAutostart(virNetworkPtr network,
+                        int *autostart)
 {
     testDriverPtr privconn = network->conn->privateData;
     virNetworkObjPtr privnet;
@@ -3600,8 +3639,10 @@ static int testNetworkGetAutostart(virNetworkPtr network,
     return ret;
 }
 
-static int testNetworkSetAutostart(virNetworkPtr network,
-                                   int autostart)
+
+static int
+testNetworkSetAutostart(virNetworkPtr network,
+                        int autostart)
 {
     testDriverPtr privconn = network->conn->privateData;
     virNetworkObjPtr privnet;